Author: thomas.diesler(a)jboss.com
Date: 2007-02-18 05:40:05 -0500 (Sun, 18 Feb 2007)
New Revision: 2393
Modified:
branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
branches/jbossws-1.2.0/build/ant.properties.example
branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Rollback to wsdl4j-1.5.2jboss
Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-17 17:10:03 UTC
(rev 2392)
+++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-18 10:40:05 UTC
(rev 2393)
@@ -38,7 +38,7 @@
<get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar"
dest="${thirdparty.dir}/getopt.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar"
dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar"
dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true"
verbose="true"/>
+ <!--get
src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar"
dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true"
verbose="true"/-->
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar"
dest="${thirdparty.dir}/javassist.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar"
dest="${thirdparty.dir}/jboss-backport-concurrent.jar"
usetimestamp="true" verbose="true"/>
<get
src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar"
dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true"
verbose="true"/>
Modified: branches/jbossws-1.2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/build/ant.properties.example 2007-02-17 17:10:03 UTC (rev
2392)
+++ branches/jbossws-1.2.0/build/ant.properties.example 2007-02-18 10:40:05 UTC (rev
2393)
@@ -5,7 +5,7 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
+#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1
#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-17 17:10:03 UTC
(rev 2392)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-18 10:40:05 UTC
(rev 2393)
@@ -16,7 +16,7 @@
<table>
<tr><th
align=left>@hudson.jboss50.build@</th><td>-r(a)hudson.jboss50.rev@
@hudson.jboss50.url@</td></tr>
- <tr><th
align=left>@hudson.jboss42.build@-ejb3</th><td>-r(a)hudson.jboss42.rev@
@hudson.jboss42.url@</td></tr>
+ <tr><th
align=left>@hudson.jboss42.build@</th><td>-r(a)hudson.jboss42.rev@
@hudson.jboss42.url@</td></tr>
<tr><th
align=left>@hudson.jboss40.build@-ejb3</th><td>-r(a)hudson.jboss40.rev@
@hudson.jboss40.url@</td></tr>
<tr><th
align=left>jboss-4.0.5.GA-ejb3</th><td>https://svn.jboss.o...
<tr><th align=left>apache-tomcat-@apache-tomcat@</th></tr>
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
#
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
#
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=(a)svn.basedir.local@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
#
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
JBOSS40_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
ENVIRONMENT="-Djbossws.integration.target=jboss40
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
ENVIRONMENT="-Djbossws.integration.target=tomcat
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -10,7 +10,7 @@
SVNBASENAME=(a)svn.basename@
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
#
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-02-17 17:10:03 UTC (rev 2392)
+++ branches/jbossws-1.2.0/build/version.properties 2007-02-18 10:40:05 UTC (rev 2393)
@@ -15,7 +15,7 @@
# thirdparty library versions that are referenced in component-info.xml
apache-xmlsec=1.3.0
-ibm-wsdl4j=1.6.2
+ibm-wsdl4j=1.5.2jboss
javassist=3.5.0.CR1
jboss-jbossxb=1.0.0.CR9
jboss-microcontainer=1.0.2
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-17
17:10:03 UTC (rev 2392)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-18
10:40:05 UTC (rev 2393)
@@ -525,7 +525,7 @@
</metainf>
</jar>
- <!-- jaxrpc-samples-wsbpel
+ <!-- jaxrpc-samples-wsbpel -->
<war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include
name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
@@ -554,7 +554,6 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- -->
<!-- jaxrpc-samples-wssecurity-sign -->
<war
warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war"
webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-17 17:10:03 UTC (rev 2392)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-18 10:40:05 UTC (rev 2393)
@@ -276,11 +276,9 @@
<taskdef name="servicegen"
classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
<classpath refid="jbpm.bpel.classpath"/>
</taskdef>
- <!-- [JBWS-1528] Implement abstract ArchiveWsdlLocator.close()
<servicegen
processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
bindingfile="hello-binding-.wsdl"
servicefile="hello-service.wsdl" />
- -->
</target>
<!--
@@ -316,7 +314,7 @@
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <!--wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/-->
+ <wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
<wstools
dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
<move todir="${tests.output.dir}/wstools/java">
<fileset
dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
includes="org/**"/>