[jbossws-commits] JBossWS SVN: r4121 - in trunk: integration/sunri and 7 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Aug 2 16:42:11 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-02 16:42:11 -0400 (Thu, 02 Aug 2007)
New Revision: 4121
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-thirdparty.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
trunk/integration/sunri/build.xml
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
trunk/integration/xfire/build.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/ant-import/macros-deploy-native.xml
trunk/jbossws-core/build.xml
trunk/testsuite/ant-import/build-jars-jaxws.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java
Log:
Externalize container/jboss4x
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/build/ant-import/build-testsuite.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -378,7 +378,7 @@
<!-- Run samples test cases -->
<target name="tests-smoke" depends="tests-init" description="Run samples unit tests">
<antcall target="tests-run-internal">
- <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
+ <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
<param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
<!--
According to our commit policy, haltonfailure MUST be be true for tests-samples.
Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -46,6 +46,7 @@
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -113,19 +113,16 @@
<macrodef name="macro-deploy-sunri42">
<attribute name="wsflibs"/>
- <attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
<copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="@{stacklibs}">
<include name="jbossws-sunri-client.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-jboss42.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -146,7 +143,7 @@
</fileset>
</copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
+ <fileset dir="@{thirdpartylibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
</copy>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/integration/sunri/build.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -193,13 +193,15 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+
<!-- Concat jboss-beans.xml -->
<concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
- <fileset file="${int.jboss42.dir}/src/main/resources/jbossws-jboss42-config.xml"/>
+ <fileset file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
@@ -238,7 +240,7 @@
<fileset dir="${sunri.output.lib.dir}/jbossws-sunri42">
<include name="jbossws.beans/**"/>
</fileset>
- <metainf dir="${int.jboss42.dir}/src/main/resources/jbossws-jboss42.sar/META-INF">
+ <metainf dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -61,6 +61,7 @@
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -97,7 +97,6 @@
<macrodef name="macro-deploy-xfire42">
<attribute name="wsflibs"/>
- <attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
@@ -108,10 +107,8 @@
<fileset dir="@{wsflibs}">
<include name="jbossws-framework.jar"/>
</fileset>
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-jboss42.jar"/>
<include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -130,7 +127,7 @@
<!--SERVER JARS -->
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
+ <fileset dir="@{thirdpartylibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
</copy>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/integration/xfire/build.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -184,13 +184,15 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <unzip dest="${xfire.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+
<!-- Concat jboss-beans.xml -->
<concat destfile="${xfire.output.lib.dir}/jbossws-xfire42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${xfire.resources.dir}/jbossws-xfire-config.xml"/>
- <fileset file="${int.jboss42.dir}/src/main/resources/jbossws-jboss42-config.xml"/>
+ <fileset file="${xfire.output.dir}/resources/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
@@ -231,7 +233,7 @@
<fileset dir="${xfire.output.lib.dir}/jbossws-xfire42">
<include name="jbossws.beans/**"/>
</fileset>
- <metainf dir="${int.jboss42.dir}/src/main/resources/jbossws-jboss42.sar/META-INF">
+ <metainf dir="${xfire.output.dir}/resources/jbossws-jboss42.sar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -70,7 +70,9 @@
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/jbossws-core/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -124,7 +124,6 @@
<macrodef name="macro-deploy-native42">
<attribute name="wsflibs"/>
- <attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
@@ -136,9 +135,6 @@
<!-- CLIENT JARS -->
<copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -146,6 +142,7 @@
<include name="jbossws-client.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-jboss42.jar"/>
<include name="policy.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -160,7 +157,7 @@
<!-- SERVER JARS -->
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
+ <fileset dir="@{thirdpartylibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
</copy>
@@ -229,7 +226,6 @@
<macrodef name="macro-deploy-native40">
<attribute name="wsflibs"/>
- <attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
@@ -247,9 +243,6 @@
<!-- CLIENT JARS -->
<copy todir="${jboss40.home}/client" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
@@ -257,6 +250,7 @@
<include name="jbossws-client.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-jboss40.jar"/>
<include name="policy.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -274,15 +268,13 @@
<!-- SERVER JARS -->
<copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss40.jar"/>
- </fileset>
<fileset dir="@{stacklibs}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-jboss40.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/jbossws-core/build.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -246,13 +246,15 @@
<target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+
<!-- Concat jboss-beans.xml -->
<concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${int.jboss42.dir}/src/main/resources/jbossws-jboss42-config.xml"/>
+ <fileset file="${core.output.dir}/resources/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
@@ -283,7 +285,7 @@
<fileset dir="${core.output.lib.dir}/jbossws-native42">
<include name="jbossws.beans/**"/>
</fileset>
- <metainf dir="${int.jboss42.dir}/src/main/resources/jbossws-jboss42.sar/META-INF">
+ <metainf dir="${core.output.dir}/resources/jbossws-jboss42.sar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
<metainf dir="${core.dir}/src/main/resources/standard-config">
@@ -294,13 +296,15 @@
<target name="jars-jboss40" depends="jars-common" if="jboss40.home">
+ <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss40-resources.zip"/>
+
<!-- Concat jboss-beans.xml -->
<concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${int.jboss40.dir}/src/main/resources/jbossws-jboss40-config.xml"/>
+ <fileset file="${core.output.dir}/resources/jbossws-jboss40-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
@@ -328,7 +332,9 @@
<fileset dir="${core.output.lib.dir}/jbossws-native40">
<include name="jbossws.beans/**"/>
</fileset>
- <metainf dir="${int.jboss40.dir}/src/main/resources/jbossws-jboss40.sar/META-INF"/>
+ <metainf dir="${core.output.dir}/resources/jbossws-jboss40.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
</metainf>
Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-08-02 20:42:11 UTC (rev 4121)
@@ -202,15 +202,15 @@
</metainf>
</jar>
- <!-- jaxws-serviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml">
+ <!-- jaxws-samples-serviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
</classes>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar">
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
@@ -222,7 +222,7 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml">
+ <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
@@ -235,7 +235,7 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar">
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-ejb-client.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2007-08-02 20:42:11 UTC (rev 4121)
@@ -43,13 +43,13 @@
*/
public class ServiceRefClientTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-serviceref";
public static Test suite()
{
- String archives = "jaxws-serviceref.war";
+ String archives = "jaxws-samples-serviceref.war";
if (new JBossWSTestHelper().isTargetJBoss50())
- archives += ",jaxws-serviceref-client.jar";
+ archives += ",jaxws-samples-serviceref-client.jar";
return new JBossWSTestSetup(ServiceRefClientTestCase.class, archives);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2007-08-02 20:42:11 UTC (rev 4121)
@@ -41,13 +41,13 @@
*/
public class ServiceRefEJBTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-serviceref";
public static Test suite()
{
- String archives = "jaxws-serviceref.war";
+ String archives = "jaxws-samples-serviceref.war";
if (new JBossWSTestHelper().isTargetJBoss50())
- archives += ",jaxws-serviceref-ejb-client.jar";
+ archives += ",jaxws-samples-serviceref-ejb-client.jar";
return new JBossWSTestSetup(ServiceRefEJBTestCase.class, archives);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2007-08-02 20:42:11 UTC (rev 4121)
@@ -42,13 +42,13 @@
*/
public class ServiceRefServletTestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-serviceref";
public static Test suite()
{
- String archives = "jaxws-serviceref.war";
+ String archives = "jaxws-samples-serviceref.war";
if (new JBossWSTestHelper().isTargetJBoss50())
- archives += ",jaxws-serviceref-servlet-client.war";
+ archives += ",jaxws-samples-serviceref-servlet-client.war";
return new JBossWSTestSetup(ServiceRefServletTestCase.class, archives);
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java 2007-08-02 20:19:44 UTC (rev 4120)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java 2007-08-02 20:42:11 UTC (rev 4121)
@@ -21,7 +21,7 @@
* JAX-WS Version: 2.0
*
*/
- at WebServiceClient(name = "TestEndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-serviceref?wsdl")
+ at WebServiceClient(name = "TestEndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-samples-serviceref?wsdl")
public class TestEndpointService
extends Service
{
@@ -31,7 +31,7 @@
static {
URL url = null;
try {
- url = new URL("http://tddell:8080/jaxws-serviceref?wsdl");
+ url = new URL("http://tddell:8080/jaxws-samples-serviceref?wsdl");
} catch (MalformedURLException e) {
e.printStackTrace();
}
More information about the jbossws-commits
mailing list