March 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15810 - in stack/native/trunk: modules/core and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 12:46:29 -0500 (Thu, 01 Mar 2012) New Revision: 15810 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/pom.xml Log: [JBWS-3442] Misc dependency updates Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2012-03-01 17:45:00 UTC (rev 15809) +++ stack/native/trunk/modules/core/pom.xml 2012-03-01 17:46:29 UTC (rev 15810) @@ -162,11 +162,11 @@ <artifactId>wsdl4j</artifactId> </dependency> <dependency> - <groupId>org.apache</groupId> + <groupId>org.apache.santuario</groupId> <artifactId>xmlsec</artifactId> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> </dependencies> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 17:45:00 UTC (rev 15809) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 17:46:29 UTC (rev 15810) @@ -52,7 +52,7 @@ <include>org.jvnet.staxex:stax-ex:jar</include> <include>com.sun.xml.stream.buffer:streambuffer:jar</include> <include>wsdl4j:wsdl4j:jar</include> - <include>org.apache:xmlsec:jar</include> + <include>org.apache.santuario:xmlsec:jar</include> <include>org.jboss.netty:netty:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> </includes> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-03-01 17:45:00 UTC (rev 15809) +++ stack/native/trunk/pom.xml 2012-03-01 17:46:29 UTC (rev 15810) @@ -72,21 +72,21 @@ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <ant.version>1.7.1</ant.version> - <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> + <codehaus.jettison.version>1.3.1</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> - <javassist.version>3.12.1.GA</javassist.version> + <javassist.version>3.15.0-GA</javassist.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> - <saaj.api.version>1.0.0.Final</saaj.api.version> + <saaj.api.version>1.0.1.Final</saaj.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <jaxb.api.version>1.0.0.Final</jaxb.api.version> + <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxb.impl.version>2.2.4</jaxb.impl.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> - <jboss.logging.version>3.1.0.Beta3</jboss.logging.version> + <jboss.logging.version>3.1.0.GA</jboss.logging.version> <jboss.jaxr.version>2.0.3</jboss.jaxr.version> <apache.scout.version>1.1.1</apache.scout.version> <juddi.version>0.9RC4</juddi.version> - <netty.version>3.2.5.Final</netty.version> + <netty.version>3.2.6.Final</netty.version> <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version> <sun.jaxws.version>2.2</sun.jaxws.version> <sun.policy.version>2.0-b01</sun.policy.version> @@ -94,7 +94,7 @@ <woodstox.version>3.2.6</woodstox.version> <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.2</wsdl4j.version> - <xmlsec.version>1.4.3</xmlsec.version> + <xmlsec.version>1.4.6</xmlsec.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> <junit.version>3.8.1</junit.version> @@ -187,7 +187,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.2</version> + <version>1.4.4</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -208,7 +208,7 @@ </exclusions> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>${javassist.version}</version> </dependency> @@ -392,7 +392,7 @@ <version>${xerces.version}</version> </dependency> <dependency> - <groupId>org.apache</groupId> + <groupId>org.apache.santuario</groupId> <artifactId>xmlsec</artifactId> <version>${xmlsec.version}</version> </dependency>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15809 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 12:45:00 -0500 (Thu, 01 Mar 2012) New Revision: 15809 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15806,15808 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15806 | alessio.soldano(a)jboss.com | 2012-03-01 17:45:14 +0100 (Thu, 01 Mar 2012) | 2 lines [JBWS-3442] Misc dependency updates ....... r15808 | alessio.soldano(a)jboss.com | 2012-03-01 18:31:06 +0100 (Thu, 01 Mar 2012) | 2 lines [JBWS-3442] Misc dependency updates ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-01 17:31:06 UTC (rev 15808) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2012-03-01 17:45:00 UTC (rev 15809) @@ -118,7 +118,7 @@ <artifactId>cxf-xjc-ts</artifactId> </dependency> <dependency> - <groupId>apache-velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> <dependency> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 17:31:06 UTC (rev 15808) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 17:45:00 UTC (rev 15809) @@ -50,7 +50,7 @@ <include>org.apache.ws.security:wss4j:jar</include> <include>org.apache.santuario:xmlsec:jar</include> <include>asm:asm:jar</include> - <include>apache-velocity:velocity:jar</include> + <include>org.apache.velocity:velocity:jar</include> <include>commons-collections:commons-collections:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> <include>commons-lang:commons-lang:jar</include> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-01 17:31:06 UTC (rev 15808) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-03-01 17:45:00 UTC (rev 15809) @@ -122,7 +122,7 @@ <artifactId>cxf-xjc-ts</artifactId> </dependency> <dependency> - <groupId>apache-velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> <dependency> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-01 17:31:06 UTC (rev 15808) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-01 17:45:00 UTC (rev 15809) @@ -25,7 +25,7 @@ <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> - <org.slf4j.version>1.5.6</org.slf4j.version> + <org.slf4j.version>1.6.1</org.slf4j.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> </properties> @@ -956,7 +956,7 @@ <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>javassist</groupId> @@ -1171,7 +1171,7 @@ <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>javassist</groupId> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-01 17:31:06 UTC (rev 15808) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-01 17:45:00 UTC (rev 15809) @@ -73,18 +73,18 @@ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.6</cxf.version> - <cxf.asm.version>3.3</cxf.asm.version> + <cxf.asm.version>3.3.1</cxf.asm.version> <cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> - <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> - <jboss.logging.version>3.1.0.Beta3</jboss.logging.version> + <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> + <jboss.logging.version>3.1.0.GA</jboss.logging.version> <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version> <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> <picketbox.version>4.0.6.Beta1</picketbox.version> <jaxws-jboss-httpserver-httpspi.version>1.0.1-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> - <jaxb.api.version>1.0.0.Final</jaxb.api.version> + <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxb.impl.version>2.2.4</jaxb.impl.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> @@ -92,16 +92,16 @@ <jsr181.api.version>1.0-MR1</jsr181.api.version> <apache.scout.version>1.1.1</apache.scout.version> <juddi.version>0.9RC4</juddi.version> - <commons-collections.version>3.1</commons-collections.version> + <commons-collections.version>3.2.1</commons-collections.version> <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> - <log4j.version>1.2.14</log4j.version> - <mail.version>1.4.2</mail.version> + <log4j.version>1.2.16</log4j.version> + <mail.version>1.4.4</mail.version> <neethi.version>3.0.1</neethi.version> - <saaj.api.version>1.0.0.Final</saaj.api.version> + <saaj.api.version>1.0.1.Final</saaj.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.0.Final</jms.api.version> - <velocity.version>1.5</velocity.version> + <velocity.version>1.6.3</velocity.version> <xerces.version>2.9.1</xerces.version> <xmlsec.version>1.5.0</xmlsec.version> <wss4j.version>1.6.5-SNAPSHOT</wss4j.version> @@ -933,7 +933,7 @@ <version>${fastinfoset.api.version}</version> </dependency> <dependency> - <groupId>apache-velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity.version}</version> </dependency>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15808 - in stack/cxf/trunk: modules/dist/src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 12:31:06 -0500 (Thu, 01 Mar 2012) New Revision: 15808 Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/pom.xml Log: [JBWS-3442] Misc dependency updates Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 17:28:13 UTC (rev 15807) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 17:31:06 UTC (rev 15808) @@ -51,7 +51,7 @@ <include>org.apache.ws.security:wss4j:jar</include> <include>org.apache.santuario:xmlsec:jar</include> <include>asm:asm:jar</include> - <include>apache-velocity:velocity:jar</include> + <include>org.apache.velocity:velocity:jar</include> <include>commons-collections:commons-collections:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> <include>commons-lang:commons-lang:jar</include> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-03-01 17:28:13 UTC (rev 15807) +++ stack/cxf/trunk/pom.xml 2012-03-01 17:31:06 UTC (rev 15808) @@ -84,7 +84,7 @@ <picketbox.version>4.0.6.Beta1</picketbox.version> <jaxws-jboss-httpserver-httpspi.version>1.0.1-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> - <jaxb.api.version>1.0.0.Final</jaxb.api.version> + <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxb.impl.version>2.2.4</jaxb.impl.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15807 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 95 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 12:28:13 -0500 (Thu, 01 Mar 2012) New Revision: 15807 Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15793,15797-15801,15803-15804 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15793 | ropalka | 2012-03-01 11:02:34 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15797 | ropalka | 2012-03-01 12:05:57 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15798 | ropalka | 2012-03-01 12:34:27 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15799 | ropalka | 2012-03-01 13:08:12 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15800 | ropalka | 2012-03-01 13:41:45 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15801 | ropalka | 2012-03-01 14:46:26 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15803 | ropalka | 2012-03-01 15:43:48 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... r15804 | ropalka | 2012-03-01 16:17:42 +0100 (Thu, 01 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15795 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -405,11 +405,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws68/ClientHandler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws68/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -419,6 +424,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws68-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws70/WEB-INF/web.xml"> @@ -434,12 +444,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws70/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -449,6 +463,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws70-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-types.jar"> @@ -472,13 +491,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws71/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -488,6 +511,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws71-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws79/WEB-INF/web.xml"> @@ -504,11 +532,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws79/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -519,6 +551,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws79-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws82/WEB-INF/web.xml"> @@ -533,11 +570,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws82/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -547,6 +588,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws82-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws83/WEB-INF/web.xml"> @@ -561,11 +607,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws83/ClientHandler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws83/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -575,6 +626,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws83-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF/web.xml"> @@ -582,18 +638,25 @@ <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/*.wsdl"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*JavaBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -603,6 +666,11 @@ <include name="wsdl/*.wsdl"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws84-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws124/WEB-INF/web.xml"> @@ -839,10 +907,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws217/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -852,6 +924,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws217-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws231/WEB-INF/web.xml"> @@ -866,11 +943,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws231/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -880,6 +961,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws231-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws251/WEB-INF/web.xml"> @@ -896,13 +982,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws251/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -912,6 +1002,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws251-appclient.jar"/> + </fileset> + </jar>  <copy todir="${tests.output.dir}/test-resources/META-INF" file="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/> @@ -928,12 +1023,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBFBean.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws316/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -943,6 +1042,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws316-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ws.jar"> @@ -990,7 +1094,7 @@ <include name="jaxrpc-jbws331-client.jar"/> </fileset> </ear> - +  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -1003,12 +1107,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*EndpointImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws349/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1018,6 +1126,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws349-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"> @@ -1076,13 +1189,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws377/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1092,6 +1209,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws377-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws381/WEB-INF/web.xml"> @@ -1105,12 +1227,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws381/WeatherForecastSoapImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws381/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1120,6 +1246,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws381-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws383/WEB-INF/web.xml"> @@ -1134,11 +1265,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws383/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1148,6 +1283,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws383-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/web.xml"> @@ -1162,11 +1302,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws413/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1176,6 +1320,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws413-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws414/WEB-INF/web.xml"> @@ -1193,13 +1342,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws414/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1210,6 +1363,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws414-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws423/WEB-INF/web.xml"> @@ -1225,12 +1383,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws423/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1240,6 +1402,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws423-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws424/WEB-INF/web.xml"> @@ -1255,13 +1422,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/TestHandler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws424/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1271,6 +1442,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws424-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws425/WEB-INF/web.xml"> @@ -1284,10 +1460,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws425/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1297,6 +1477,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws425-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws434/WEB-INF/web.xml"> @@ -1312,12 +1497,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws434/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1327,6 +1516,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws434-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws456/WEB-INF/web.xml"> @@ -1341,12 +1535,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws456/TestHandler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws456/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1356,6 +1554,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws456-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws463/WEB-INF/web.xml"> @@ -1369,10 +1572,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws463/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1382,6 +1589,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws463-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws464/WEB-INF/web.xml"> @@ -1396,10 +1608,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws464/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1409,6 +1625,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws464-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws484/WEB-INF/web.xml"> @@ -1422,12 +1643,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws484/TestServiceBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws484/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1437,6 +1662,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws484-appclient.jar"/> + </fileset> + </jar>  <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.jar"> @@ -1454,13 +1684,20 @@ <include name="webservices.xml"/> <include name="wsdl/TestService.wsdl"/> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1468,13 +1705,17 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws626-appclient.jar"/> + </fileset> + </jar> <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF/application.xml"> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF"> <include name="jboss-app.xml"/> </metainf> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxrpc-jbws626.jar"/> - <include name="jaxrpc-jbws626-client.jar"/> </fileset> </ear> @@ -1491,11 +1732,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws632/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1505,6 +1750,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws632-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-client.jar"> @@ -1532,11 +1782,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws643/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1546,6 +1800,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws643-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663b/WEB-INF/web.xml"> @@ -1706,12 +1965,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws706/DemoServicePortTypeImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws706/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1721,6 +1984,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws706-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws707/WEB-INF/web.xml"> @@ -1735,11 +2003,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws707/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1749,6 +2021,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws707-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws710/WEB-INF/web.xml"> @@ -1762,12 +2039,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws710/HelloBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws710/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1777,6 +2058,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws710-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws720/WEB-INF/web.xml"> @@ -1790,12 +2076,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws720/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1805,6 +2095,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws720-appclient.jar"/> + </fileset> + </jar>  <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723.jar"> @@ -1850,11 +2145,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws732/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1865,6 +2164,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws732-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws751/WEB-INF/web.xml"> @@ -1949,12 +2253,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws775/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1964,6 +2272,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws775-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws801/WEB-INF/web.xml"> @@ -1984,17 +2297,24 @@ <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2004,6 +2324,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws807-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws812/WEB-INF/web.xml"> @@ -2021,10 +2346,14 @@ <attribute name="Dependencies" value="org.jboss.ws.common"/> </manifest> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws812/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2034,6 +2363,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws812-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws950/WEB-INF/web.xml"> @@ -2119,10 +2453,14 @@ <include name="wsdl/TestService.wsdl"/> </metainf> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1011/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2130,6 +2468,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1011-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1093/WEB-INF/web.xml"> @@ -2144,10 +2487,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1093/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2157,6 +2504,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1093-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1107/WEB-INF/web.xml"> @@ -2170,10 +2522,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1107/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2183,6 +2539,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1107-appclient.jar"/> + </fileset> + </jar>  <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF/web.xml"> @@ -2201,10 +2562,14 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2219,14 +2584,15 @@ <include name="wsse.truststore"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1121-appclient.jar"/> + </fileset> + </jar> <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF/application.xml"> <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1121-client.jar"/> <include name="jaxrpc-jbws1121.war"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF"> - <include name="jboss-app.xml"/> - </metainf> </ear>  @@ -2254,6 +2620,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -2287,6 +2656,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -2310,12 +2682,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1125/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2325,6 +2701,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1125-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1148/WEB-INF/web.xml"> @@ -2339,11 +2720,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1148/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2352,6 +2737,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1148-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF/web.xml"> @@ -2421,6 +2811,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common,org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/WEB-INF"> <include name="webservices.xml"/> <include name="test-mapping.xml"/> @@ -2428,10 +2821,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2440,6 +2837,11 @@ <include name="test-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1190-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> @@ -2465,6 +2867,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> <include name="webservices.xml"/> <include name="test-mapping.xml"/> @@ -2476,11 +2881,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/Client/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2489,6 +2898,11 @@ <include name="test-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1205-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1303/WEB-INF/web.xml"> @@ -2502,11 +2916,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1303/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2516,6 +2934,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1303-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF/web.xml"> @@ -2756,10 +3179,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestException.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws2234/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2768,7 +3196,12 @@ <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - </jar> + </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws2234-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -41,10 +41,10 @@ { private static TestEndpoint port; - + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar"); + return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-appclient.ear#jaxrpc-jbws1011-appclient.jar"); } public void setUp() throws Exception @@ -52,12 +52,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testCall() throws Exception { String response = port.echoString("Hello"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -51,10 +51,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); + return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-appclient.ear#jaxrpc-jbws1093-appclient.jar"); } public void setUp() throws Exception @@ -62,12 +63,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEnpointAccess() throws Exception { assertEquals(ServletTest.MESSAGE, port.echoString(ServletTest.MESSAGE)); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,10 +40,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-client.jar"); + return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-appclient.ear#jaxrpc-jbws1107-appclient.jar"); } public void setUp() throws Exception @@ -51,12 +52,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testAccessEnpoint() throws Exception { assertEquals("Hello", port.echoString("Hello")); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -45,10 +45,11 @@ { private static HelloWorld port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear"); + return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear, jaxrpc-jbws1121-appclient.ear#jaxrpc-jbws1121-appclient.jar"); } public void setUp() throws Exception @@ -56,12 +57,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloWorldService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloWorldService"); port = (HelloWorld)service.getPort(HelloWorld.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCall() throws Exception { String response = port.echo("Hello"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -47,10 +47,11 @@ public class JBWS1125TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-client.jar"); + return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-appclient.ear#jaxrpc-jbws1125-appclient.jar"); } public void setUp() throws Exception @@ -58,12 +59,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testNoParamPart() throws Exception { String retObj = port.noParamPart(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -41,10 +41,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar"); + return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-appclient.ear#jaxrpc-jbws1148-appclient.jar"); } public void setUp() throws Exception @@ -52,12 +53,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCall() throws Exception { TelephoneNumber number = port.lookup("SomeName"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,24 +40,34 @@ public class JBWS1190TestCase extends JBossWSTest { private static final String ARCHIVE_NAME = "jaxrpc-jbws1190.war"; + private static InitialContext iniCtx; private static TestEndpoint port; public static Test suite() { - return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-client.jar"); + return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-appclient.ear#jaxrpc-jbws1190-appclient.jar"); } protected void setUp() throws Exception { if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testTestEndpoint() throws Exception { port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -29,6 +29,7 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.SPIProvider; @@ -45,7 +46,7 @@ public void testAddress(final String archive, final String service, final String scheme, final String port) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class, ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader()).getServerConfig(); File dataDir = serverConfig.getServerDataDir(); File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -41,10 +41,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar"); + return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-appclient.ear#jaxrpc-jbws1205-appclient.jar"); } @@ -53,12 +54,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEndpoint() throws Exception { port.performTest(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -28,6 +28,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.SPIProvider; @@ -48,8 +49,9 @@ try { + ClassLoader integrationCL = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class, integrationCL).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); tmpDir = new File(tmpDir.getCanonicalPath() + "/jbossws"); baseFiles = getXsdTempFiles(tmpDir); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,10 +40,11 @@ public class JBWS1303TestCase extends JBossWSTest { private static LastMod_PortType port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); + return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-appclient.ear#jaxrpc-jbws1303-appclient.jar"); } protected void setUp() throws Exception @@ -51,12 +52,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (LastMod_PortType)service.getPort(LastMod_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEndpoint() throws Exception { Lastmod lastmod = new Lastmod("yesterday"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -41,7 +41,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-client.jar"); + return new JBossWSTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-appclient.ear#jaxrpc-jbws217-appclient.jar"); } /** @@ -49,12 +49,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - int in0 = 100; - int retObj = hello.hello(in0); - assertEquals(in0, retObj); + int in0 = 100; + int retObj = hello.hello(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -39,10 +39,11 @@ public class JBWS2234TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-appclient.ear#jaxrpc-jbws2234-appclient.jar"); } public void setUp() throws Exception @@ -50,12 +51,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCall() throws Exception { final String message = "Hello!!"; Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,10 +40,11 @@ public class JBWS231TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-client.jar"); + return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-appclient.ear#jaxrpc-jbws231-appclient.jar"); } public void setUp() throws Exception @@ -51,12 +52,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testSimple() throws Exception { EyeColorType ret = port.echoSimple(EyeColorType.green); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,11 +42,12 @@ public class JBWS251TestCase extends JBossWSTest { private static Hello hello; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-client.jar"); + return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-appclient.ear#jaxrpc-jbws251-appclient.jar"); } public void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (hello == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); hello = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testNoException() throws Exception { String inStr = "Kermit"; Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,11 +42,12 @@ public class JBWS316TestCase extends JBossWSTest { private static TestBusinessFacadeBF_WS endpoint; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-client.jar"); + return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-appclient.ear#jaxrpc-jbws316-appclient.jar"); } public void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); endpoint = (TestBusinessFacadeBF_WS)service.getPort(TestBusinessFacadeBF_WS.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + /** * Test JSE endpoint */ Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,10 +40,11 @@ public class JBWS349TestCase extends JBossWSTest { private static ServiceFacadeEndpoint endpoint; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-client.jar"); + return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-appclient.ear#jaxrpc-jbws349-appclient.jar"); } public void setUp() throws Exception @@ -51,13 +52,23 @@ super.setUp(); if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ServiceFacade"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ServiceFacade"); endpoint = (ServiceFacadeEndpoint)service.getPort(ServiceFacadeEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testAssetCreate() throws Exception { Event event = new AssetCreate("AssetCreate", 1, "templ"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -39,16 +39,34 @@ */ public class JBWS377TestCase extends JBossWSTest { + + private InitialContext iniCtx; + /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-client.jar"); + return new JBossWSTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-appclient.ear#jaxrpc-jbws377-appclient.jar"); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testEndpointNotNull() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType user = new UserType("kermit"); @@ -58,8 +76,7 @@ public void testEndpointNull() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); String retObj = hello.echoStrings(null, "str2", null); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -41,11 +41,12 @@ public class JBWS381TestCase extends JBossWSTest { private WeatherForecastSoap port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-client.jar"); + return new JBossWSTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-appclient.ear#jaxrpc-jbws381-appclient.jar"); } protected void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (WeatherForecastSoap)service.getPort(WeatherForecastSoap.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testWeatherByPlaceName() throws Exception { GetWeatherByPlaceNameResponse retObj = port.getWeatherByPlaceName(new GetWeatherByPlaceName("Munich")); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,18 +42,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-client.jar"); + return new JBossWSTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-appclient.ear#jaxrpc-jbws383-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - JavaType in = new JavaType(new Double[]{new Double(1), new Double(2), new Double(3)}); - JavaType retObj = port.doStuff(in); - assertEquals(in, retObj); + JavaType in = new JavaType(new Double[]{new Double(1), new Double(2), new Double(3)}); + JavaType retObj = port.doStuff(in); + assertEquals(in, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -49,18 +49,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-client.jar"); + return new JBossWSTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-appclient.ear#jaxrpc-jbws413-appclient.jar"); } - public void testClientAccess() throws Exception + public void testAppclientAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - JavaType in = new JavaType(new Double[] { new Double(1), new Double(2), new Double(3) }); - JavaType retObj = port.doStuff(in); - assertEquals(in, retObj); + JavaType in = new JavaType(new Double[] { new Double(1), new Double(2), new Double(3) }); + JavaType retObj = port.doStuff(in); + assertEquals(in, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,18 +42,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-client.jar"); + return new JBossWSTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-appclient.ear#jaxrpc-jbws414-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - St st = new St(new RefType("A more appropiate test string")); - St retObj = port.doStuff(st); - assertEquals(st, retObj); + St st = new St(new RefType("A more appropiate test string")); + St retObj = port.doStuff(st); + assertEquals(st, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -41,11 +41,12 @@ public class JBWS423TestCase extends JBossWSTest { private static DemoEndpoint port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-client.jar"); + return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-appclient.ear#jaxrpc-jbws423-appclient.jar"); } @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (DemoEndpoint)service.getPort(DemoEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testGetArray() throws Exception { ValueObj[] expArr = new ValueObj[] { new ValueObj("a", "b"), new ValueObj("c", "d") }; Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,24 +42,35 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-client.jar"); + return new JBossWSTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-appclient.ear#jaxrpc-jbws424-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); - + InitialContext iniCtx = null; try { - port.doStuff("A more appropiate test string"); - fail("Expected Exception2"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); + + try + { + port.doStuff("A more appropiate test string"); + fail("Expected Exception2"); + } + catch (Exception2 ex) + { + assertEquals("Some exception description", ex.getDescription()); + assertEquals("bang", ex.getShortDescr()); + } } - catch (Exception2 ex) + finally { - assertEquals("Some exception description", ex.getDescription()); - assertEquals("bang", ex.getShortDescr()); + if (iniCtx != null) + { + iniCtx.close(); + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -54,12 +54,12 @@ public class JBWS425TestCase extends JBossWSTest { private static final String SOAP_ACTION = "\"urn:some-soap-action\""; - + private static InitialContext iniCtx; private static Hello endpoint; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-client.jar"); + return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-appclient.ear#jaxrpc-jbws425-appclient.jar"); } public void setUp() throws Exception @@ -67,12 +67,22 @@ super.setUp(); if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); endpoint = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testClientActionFromWSDL() throws Exception { String soapAction = endpoint.hello("Hello Server"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -45,10 +45,11 @@ public class JBWS434TestCase extends JBossWSTest { private static TestServiceEndpoint port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-client.jar"); + return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-appclient.ear#jaxrpc-jbws434-appclient.jar"); } protected void setUp() throws Exception @@ -56,12 +57,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestServiceEndpoint)service.getPort(TestServiceEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testWildCardArrayWithOtherNS() throws Exception { SOAPFactory factory = SOAPFactory.newInstance(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -44,18 +44,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-client.jar"); + return new JBossWSTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-appclient.ear#jaxrpc-jbws456-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - JavaType in = new JavaType("A more appropiate test string"); - JavaType retObj = port.doStuff(in); - assertEquals(in.getValue() + " - Processed", TestHandler.getReturnParam()); + JavaType in = new JavaType("A more appropiate test string"); + JavaType retObj = port.doStuff(in); + assertEquals(in.getValue() + " - Processed", TestHandler.getReturnParam()); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,10 +42,11 @@ public class JBWS463TestCase extends JBossWSTest { private static TestSEI port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-client.jar"); + return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-appclient.ear#jaxrpc-jbws463-appclient.jar"); } protected void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestSEI)service.getPort(TestSEI.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testInteger() throws Exception { String retObj = port.doStuff(new Integer(1)); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -44,10 +44,11 @@ public class JBWS464TestCase extends JBossWSTest { private static Hello hello; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-client.jar"); + return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-appclient.ear#jaxrpc-jbws464-appclient.jar"); } public void setUp() throws Exception @@ -55,12 +56,22 @@ super.setUp(); if (hello == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); hello = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testValidAccess() throws Exception { String retObj = hello.hello("Hello Server"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,10 +42,11 @@ public class JBWS484TestCase extends JBossWSTest { private static TestService_PortType endpoint; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-client.jar"); + return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-appclient.ear#jaxrpc-jbws484-appclient.jar"); } public void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); endpoint = (TestService_PortType)service.getPort(TestService_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testValidAccess() throws Exception { int retObj = endpoint.testMethod("Hello", "Server"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -39,12 +39,13 @@ */ public class JBWS626TestCase extends JBossWSTest { + private static InitialContext iniCtx; private static DemoEndpoint port; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear"); + return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear, jaxrpc-jbws626-appclient.ear#jaxrpc-jbws626-appclient.jar"); } protected void setUp() throws Exception @@ -52,12 +53,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service) iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service) iniCtx.lookup("java:service/TestService"); port = (DemoEndpoint) service.getPort(DemoEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + public void testGetArray() throws Exception { ValueObj[] expArr = new ValueObj[] Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,11 +42,12 @@ public class JBWS632TestCase extends JBossWSTest { private static TestSEI port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar"); + return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-appclient.ear#jaxrpc-jbws632-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestSEI)service.getPort(TestSEI.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + public void testStringArray() throws Exception { String[][] arr = new String[][]{new String[]{"a", "b"}, new String[]{"", null}, new String[]{"c", "d"}}; Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,11 +42,12 @@ public class JBWS643TestCase extends JBossWSTest { private static ResearchService port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar"); + return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-appclient.ear#jaxrpc-jbws643-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ResearchService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ResearchService"); port = (ResearchService)service.getPort(ResearchService.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -48,7 +48,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar"); + return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-appclient.ear#jaxrpc-jbws68-appclient.jar"); } /** @@ -56,12 +56,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,6 +42,7 @@ public class JBWS70TestCase extends JBossWSTest { private static Hello hello; + private static InitialContext iniCtx; public JBWS70TestCase(String name) { @@ -57,7 +58,7 @@ suite.addTest(new JBWS70TestCase("testSetVersion")); suite.addTest(new JBWS70TestCase("testGetVersion")); - return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-client.jar"); + return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-appclient.ear#jaxrpc-jbws70-appclient.jar"); } public void setUp() throws Exception @@ -65,12 +66,22 @@ super.setUp(); if (hello == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); hello = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testSetVersion() throws Exception { hello.setVersion("Version-1.0"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,16 +42,27 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-client.jar"); + return new JBossWSTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-appclient.ear#jaxrpc-jbws706-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - DemoServicePortType hello = (DemoServicePortType)service.getPort(DemoServicePortType.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + DemoServicePortType hello = (DemoServicePortType)service.getPort(DemoServicePortType.class); - Descr retObj = hello.processDescr("descr"); - assertEquals("descr", retObj.getDescription()); + Descr retObj = hello.processDescr("descr"); + assertEquals("descr", retObj.getDescription()); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -54,11 +54,12 @@ public class JBWS707TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-client.jar"); + return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-appclient.ear#jaxrpc-jbws707-appclient.jar"); } public void setUp() throws Exception @@ -66,12 +67,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testSpecialChars() throws Exception { String inStr = "&Test & this &"; Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-client.jar"); + return new JBossWSTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-appclient.ear#jaxrpc-jbws71-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,11 +40,12 @@ public class JBWS710TestCase extends JBossWSTest { private static Hello port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-client.jar"); + return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-appclient.ear#jaxrpc-jbws710-appclient.jar"); } protected void setUp() throws Exception @@ -52,12 +53,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); port = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testOnewayRequest() throws Exception { port.onewayRequest("str1", "str2", "str3"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,11 +42,12 @@ public class JBWS720TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-client.jar"); + return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-appclient.ear#jaxrpc-jbws720-appclient.jar"); } public void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testLangEmptyAny() throws Exception { GetProperty inObj = new GetProperty(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,10 +42,11 @@ { private static WrappedEndpoint wrapped; private static BareEndpoint bare; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-client.jar"); + return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-appclient.ear#jaxrpc-jbws732-appclient.jar"); } protected void setUp() throws Exception @@ -53,15 +54,24 @@ super.setUp(); if (wrapped == null || bare == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/jbws732/wrapped"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/jbws732/wrapped"); wrapped = (WrappedEndpoint)service.getPort(WrappedEndpoint.class); - service = (Service)iniCtx.lookup("java:comp/env/service/jbws732/bare"); + service = (Service)iniCtx.lookup("java:service/jbws732/bare"); bare = (BareEndpoint)service.getPort(BareEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } /* Wrapped Style, Unwrapped Arrays */ public void testEchoUnwrappedArrayWrappedStyleElements() throws Exception Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -50,25 +50,36 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-client.jar"); + return new JBossWSTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-appclient.ear#jaxrpc-jbws775-appclient.jar"); } public void testEndpointAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/DocumentTranslator"); - DocumentTranslator port = (DocumentTranslator)service.getPort(DocumentTranslator.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/DocumentTranslator"); + DocumentTranslator port = (DocumentTranslator)service.getPort(DocumentTranslator.class); - TDocumentHead tDocHead = new TDocumentHead("title", "en"); - TDocumentBody tDocBody = new TDocumentBody(new String[] {"hi", "bye"}); - TDocument tDocReq = new TDocument(tDocHead, tDocBody); - TTranslationRequest tReq = new TTranslationRequest("es", tDocReq); + TDocumentHead tDocHead = new TDocumentHead("title", "en"); + TDocumentBody tDocBody = new TDocumentBody(new String[] {"hi", "bye"}); + TDocument tDocReq = new TDocument(tDocHead, tDocBody); + TTranslationRequest tReq = new TTranslationRequest("es", tDocReq); - TDocument tDocRes = port.translate(tReq); - assertEquals("en", tDocRes.getHead().getLanguage()); - assertEquals("title", tDocRes.getHead().getTitle()); - assertEquals("hi", tDocRes.getBody().getParagraph()[0]); - assertEquals("bye", tDocRes.getBody().getParagraph()[1]); + TDocument tDocRes = port.translate(tReq); + assertEquals("en", tDocRes.getHead().getLanguage()); + assertEquals("title", tDocRes.getHead().getTitle()); + assertEquals("hi", tDocRes.getBody().getParagraph()[0]); + assertEquals("bye", tDocRes.getBody().getParagraph()[1]); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } public void testSAAJAccess() throws Exception Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -40,18 +40,33 @@ */ public class JBWS79TestCase extends JBossWSTest { + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-client.jar"); + return new JBossWSTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-appclient.ear#jaxrpc-jbws79-appclient.jar"); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + /** Test endpoint one */ public void testEndpointOne() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloOneService"); + Service service = (Service)iniCtx.lookup("java:service/HelloOneService"); HelloOne hello = (HelloOne)service.getPort(HelloOne.class); String in0 = "Kermit"; @@ -62,8 +77,7 @@ */ public void testEndpointTwo() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloTwoService"); + Service service = (Service)iniCtx.lookup("java:service/HelloTwoService"); HelloTwo hello = (HelloTwo)service.getPort(HelloTwo.class); QName in0 = new QName("http://somens", "Kermit"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,10 +42,11 @@ public class JBWS807TestCase extends JBossWSTest { private static TestService_PortType port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); + return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-appclient.ear#jaxrpc-jbws807-appclient.jar"); } protected void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestService_PortType)service.getPort(TestService_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testPingMsg() throws Exception { try Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -67,7 +67,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar"); + return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-appclient.ear#jaxrpc-jbws812-appclient.jar"); } /** Send the raw bytes via an HttpURLConnection @@ -156,15 +156,24 @@ } - /** Test client proxy API - */ - public void testClientProxy() throws Exception + public void testAppclientProxy() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String resStr = port.echoSimple("\u00a0"); - assertEquals(160, resStr.charAt(0)); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String resStr = port.echoSimple("\u00a0"); + assertEquals(160, resStr.charAt(0)); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar"); + return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-appclient.ear#jaxrpc-jbws82-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar"); + return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-appclient.ear#jaxrpc-jbws83-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2012-03-01 17:28:13 UTC (rev 15807) @@ -54,7 +54,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar"); + return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-appclient.ear#jaxrpc-jbws84-appclient.jar"); } /** Use the JBoss generated dynamic proxy send the SOAP message. @@ -62,23 +62,34 @@ */ public void testProcessSOAPElement() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService"); - Message port = (Message)service.getPort(Message.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/MessageService"); + Message port = (Message)service.getPort(Message.class); - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessage reqMessage = factory.createMessage(); + MessageFactory factory = MessageFactory.newInstance(); + SOAPMessage reqMessage = factory.createMessage(); - DocumentBuilder builder = getDocumentBuilder(); - Document doc = builder.parse(new ByteArrayInputStream(Message.request.getBytes())); - reqMessage.getSOAPBody().addDocument(doc); + DocumentBuilder builder = getDocumentBuilder(); + Document doc = builder.parse(new ByteArrayInputStream(Message.request.getBytes())); + reqMessage.getSOAPBody().addDocument(doc); - SOAPEnvelope soapEnvelope = reqMessage.getSOAPPart().getEnvelope(); - SOAPBody soapBody = soapEnvelope.getBody(); - SOAPElement reqElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPEnvelope soapEnvelope = reqMessage.getSOAPPart().getEnvelope(); + SOAPBody soapBody = soapEnvelope.getBody(); + SOAPElement reqElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement resElement = port.processSOAPElement(reqElement); - validateResponse(resElement); + SOAPElement resElement = port.processSOAPElement(reqElement); + validateResponse(resElement); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1011/TestEndpointBean?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1093/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1107/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloWorldService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloWorldService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloWorldService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -13,8 +13,4 @@ </web> </module> - <module> - <java>jaxrpc-jbws1121-client.jar</java> - </module> - </application> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-app - PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" - "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> - -<jboss-app> - <loader-repository>jboss.ws.test:loader=JBWS1121</loader-repository> -</jboss-app> \ No newline at end of file Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloWorldService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloWorldService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1121?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -4,10 +4,6 @@ <jboss-web> - <class-loading> - <loader-repository>jbossws.jbws1124:domain=@jbws1124.domain@ </loader-repository> - </class-loading> - <context-root>/(a)jbws1124.domain@</context-root> </jboss-web> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1125?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1148?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1190/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,7 +5,7 @@ <servlet> <servlet-name>ConfidentialEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpointImpl</servlet-class> </servlet> <servlet> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1205-test?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1303?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws217?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws2234/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws231?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws251?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestBusinessFacadeBF.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/TestBusinessFacadeMapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws316?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,7 +5,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/ServiceFacade</service-ref-name> + <service-ref-name>java:jboss/exported/service/ServiceFacade</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/ServiceFacade.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/ServiceFacade</service-ref-name> + <service-ref-name>java:jboss/exported/service/ServiceFacade</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws349?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws377?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/WeatherForecast.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws381?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws383?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws413?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws414?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws423?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws424?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,7 +5,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws425?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws434?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws456?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws463?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -6,7 +6,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -4,10 +4,8 @@ <jboss-client> - <jndi-name>jbossws-client</jndi-name> - <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws464?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -6,7 +6,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -4,10 +4,8 @@ <jboss-client> - <jndi-name>jbossws-client</jndi-name> - <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws484?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -13,8 +13,4 @@ </ejb> </module> - <module> - <java>jaxrpc-jbws626-client.jar</java> - </module> </application> - Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws626/DemoBean?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws632?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/ResearchService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ResearchService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/yahoo-research.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/ResearchService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ResearchService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws643?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws68?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws70?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/logic_top.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws706?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/EchoService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws707?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws71?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws710?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws720?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,7 +3,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/jbws732/wrapped</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/wrapped</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>USE_JBOSS_CLIENT_XML_OVERRIDE</wsdl-file> <jaxrpc-mapping-file>META-INF/wrapped-mapping.xml</jaxrpc-mapping-file> @@ -14,7 +14,7 @@ </service-ref> <service-ref> - <service-ref-name>service/jbws732/bare</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/bare</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>USE_JBOSS_CLIENT_XML_OVERRIDE</wsdl-file> <jaxrpc-mapping-file>META-INF/bare-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,15 +3,14 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/jbws732/wrapped</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/wrapped</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws732/WrappedService?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/jbws732/bare</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/bare</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws732/BareService?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/DocumentTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/DocumentTranslator</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/translator.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> @@ -18,7 +18,7 @@ </service-ref> <service-ref> - <service-ref-name>service/TextTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/TextTranslator</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/translator.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,14 +3,13 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/DocumentTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/DocumentTranslator</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws775/document?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/TextTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/TextTranslator</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws775/text?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -9,7 +9,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloOneService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloOneService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping-one.xml</jaxrpc-mapping-file> @@ -19,7 +19,7 @@ </port-component-ref> </service-ref> <service-ref> - <service-ref-name>service/HelloTwoService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloTwoService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping-two.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,14 +5,13 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloOneService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloOneService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws79/HelloOne?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/HelloTwoService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloTwoService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws79/HelloTwo?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws807?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws812?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws82/services/Foo?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws83?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -9,7 +9,7 @@ <display-name>Test web service</display-name> <service-ref> - <service-ref-name>service/MessageService</service-ref-name> + <service-ref-name>java:jboss/exported/service/MessageService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/MessageService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/MessageService</service-ref-name> + <service-ref-name>java:jboss/exported/service/MessageService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws84?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-01 16:45:14 UTC (rev 15806) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-01 17:28:13 UTC (rev 15807) @@ -1172,67 +1172,21 @@ <exclude>org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude> @@ -1252,11 +1206,10 @@ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15806 - in stack/cxf/trunk: modules/client and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 11:45:14 -0500 (Thu, 01 Mar 2012) New Revision: 15806 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3442] Misc dependency updates Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2012-03-01 15:18:17 UTC (rev 15805) +++ stack/cxf/trunk/modules/client/pom.xml 2012-03-01 16:45:14 UTC (rev 15806) @@ -118,7 +118,7 @@ <artifactId>cxf-xjc-ts</artifactId> </dependency> <dependency> - <groupId>apache-velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2012-03-01 15:18:17 UTC (rev 15805) +++ stack/cxf/trunk/modules/server/pom.xml 2012-03-01 16:45:14 UTC (rev 15806) @@ -126,7 +126,7 @@ <artifactId>cxf-xjc-ts</artifactId> </dependency> <dependency> - <groupId>apache-velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-01 15:18:17 UTC (rev 15805) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-01 16:45:14 UTC (rev 15806) @@ -25,7 +25,7 @@ <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> - <org.slf4j.version>1.5.6</org.slf4j.version> + <org.slf4j.version>1.6.1</org.slf4j.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> </properties> @@ -953,7 +953,7 @@ <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>javassist</groupId> @@ -1165,7 +1165,7 @@ <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>javassist</groupId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-03-01 15:18:17 UTC (rev 15805) +++ stack/cxf/trunk/pom.xml 2012-03-01 16:45:14 UTC (rev 15806) @@ -73,11 +73,11 @@ <jboss711.version>7.1.1.Final-SNAPSHOT</jboss711.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.5.2</cxf.version> - <cxf.asm.version>3.3</cxf.asm.version> + <cxf.asm.version>3.3.1</cxf.asm.version> <cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> - <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> - <jboss.logging.version>3.1.0.Beta3</jboss.logging.version> + <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> + <jboss.logging.version>3.1.0.GA</jboss.logging.version> <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version> <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> @@ -92,17 +92,17 @@ <jsr181.api.version>1.0-MR1</jsr181.api.version> <apache.scout.version>1.1.1</apache.scout.version> <juddi.version>0.9RC4</juddi.version> - <commons-collections.version>3.1</commons-collections.version> + <commons-collections.version>3.2.1</commons-collections.version> <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> - <log4j.version>1.2.14</log4j.version> - <mail.version>1.4.2</mail.version> + <log4j.version>1.2.16</log4j.version> + <mail.version>1.4.4</mail.version> <neethi.version>3.0.1</neethi.version> <opensaml.version>2.5.1-1</opensaml.version> - <saaj.api.version>1.0.0.Final</saaj.api.version> + <saaj.api.version>1.0.1.Final</saaj.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.0.Final</jms.api.version> - <velocity.version>1.5</velocity.version> + <velocity.version>1.6.3</velocity.version> <xerces.version>2.9.1</xerces.version> <xmlsec.version>1.5.0</xmlsec.version> <wss4j.version>1.6.5-SNAPSHOT</wss4j.version> @@ -939,7 +939,7 @@ <version>${fastinfoset.api.version}</version> </dependency> <dependency> - <groupId>apache-velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity.version}</version> </dependency>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15805 - container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 10:18:17 -0500 (Thu, 01 Mar 2012) New Revision: 15805 Modified: container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java Log: Synch remote deployer address configuration with upstream Modified: container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-03-01 15:17:42 UTC (rev 15804) +++ container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-03-01 15:18:17 UTC (rev 15805) @@ -59,13 +59,23 @@ private static final Logger LOGGER = Logger.getLogger(RemoteDeployer.class); private static final int PORT = 9999; + private static final String JBWS_DEPLOYER_HOST = "jbossws.deployer.host"; + private static final String JBWS_DEPLOYER_PORT = "jbossws.deployer.port"; private final Map<URL, String> url2Id = new HashMap<URL, String>(); private final InetAddress address = InetAddress.getByName("127.0.0.1"); private ServerDeploymentManager deploymentManager; public RemoteDeployer() throws IOException { - deploymentManager = ServerDeploymentManager.Factory.create(address, PORT); + final String host = System.getProperty(JBWS_DEPLOYER_HOST); + InetAddress address; + if (host != null) { + address = InetAddress.getByName(host); + } else { + address = InetAddress.getByName("localhost"); + } + final Integer port = Integer.getInteger(JBWS_DEPLOYER_PORT, PORT); + deploymentManager = ServerDeploymentManager.Factory.create(address, port); } @Override

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15804 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 10:17:42 -0500 (Thu, 01 Mar 2012) New Revision: 15804 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -2453,10 +2453,14 @@ <include name="wsdl/TestService.wsdl"/> </metainf> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1011/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2464,6 +2468,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1011-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1093/WEB-INF/web.xml"> @@ -2478,10 +2487,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1093/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2491,6 +2504,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1093-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1107/WEB-INF/web.xml"> @@ -2849,6 +2867,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> <include name="webservices.xml"/> <include name="test-mapping.xml"/> @@ -2860,11 +2881,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/Client/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2873,6 +2898,11 @@ <include name="test-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1205-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1303/WEB-INF/web.xml"> @@ -2886,11 +2916,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1303/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2900,6 +2934,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1303-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2012-03-01 15:17:42 UTC (rev 15804) @@ -41,10 +41,10 @@ { private static TestEndpoint port; - + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar"); + return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-appclient.ear#jaxrpc-jbws1011-appclient.jar"); } public void setUp() throws Exception @@ -52,12 +52,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testCall() throws Exception { String response = port.echoString("Hello"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-03-01 15:17:42 UTC (rev 15804) @@ -51,10 +51,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); + return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-appclient.ear#jaxrpc-jbws1093-appclient.jar"); } public void setUp() throws Exception @@ -62,12 +63,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEnpointAccess() throws Exception { assertEquals(ServletTest.MESSAGE, port.echoString(ServletTest.MESSAGE)); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2012-03-01 15:17:42 UTC (rev 15804) @@ -41,10 +41,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar"); + return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-appclient.ear#jaxrpc-jbws1205-appclient.jar"); } @@ -53,12 +54,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEndpoint() throws Exception { port.performTest(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2012-03-01 15:17:42 UTC (rev 15804) @@ -28,6 +28,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.SPIProvider; @@ -48,8 +49,9 @@ try { + ClassLoader integrationCL = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class, integrationCL).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); tmpDir = new File(tmpDir.getCanonicalPath() + "/jbossws"); baseFiles = getXsdTempFiles(tmpDir); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2012-03-01 15:17:42 UTC (rev 15804) @@ -40,10 +40,11 @@ public class JBWS1303TestCase extends JBossWSTest { private static LastMod_PortType port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); + return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-appclient.ear#jaxrpc-jbws1303-appclient.jar"); } protected void setUp() throws Exception @@ -51,12 +52,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (LastMod_PortType)service.getPort(LastMod_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEndpoint() throws Exception { Lastmod lastmod = new Lastmod("yesterday"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/application-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1011/TestEndpointBean?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1093/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1205-test?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/application-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1303/META-INF/jboss-client.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1303?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 14:43:48 UTC (rev 15803) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 15:17:42 UTC (rev 15804) @@ -1172,19 +1172,15 @@ <exclude>org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15803 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 12 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 09:43:48 -0500 (Thu, 01 Mar 2012) New Revision: 15803 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -2504,10 +2504,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1107/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2517,6 +2521,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1107-appclient.jar"/> + </fileset> + </jar>  <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF/web.xml"> @@ -2535,10 +2544,14 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2553,14 +2566,15 @@ <include name="wsse.truststore"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1121-appclient.jar"/> + </fileset> + </jar> <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF/application.xml"> <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1121-client.jar"/> <include name="jaxrpc-jbws1121.war"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF"> - <include name="jboss-app.xml"/> - </metainf> </ear>  @@ -2588,6 +2602,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -2621,6 +2638,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -2644,12 +2664,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1125/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2659,6 +2683,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1125-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1148/WEB-INF/web.xml"> @@ -2673,11 +2702,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1148/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2686,6 +2719,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1148-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF/web.xml"> @@ -2755,6 +2793,9 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common,org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/WEB-INF"> <include name="webservices.xml"/> <include name="test-mapping.xml"/> @@ -2762,10 +2803,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2774,6 +2819,11 @@ <include name="test-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1190-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) @@ -40,10 +40,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-client.jar"); + return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-appclient.ear#jaxrpc-jbws1107-appclient.jar"); } public void setUp() throws Exception @@ -51,12 +52,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testAccessEnpoint() throws Exception { assertEquals("Hello", port.echoString("Hello")); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) @@ -45,10 +45,11 @@ { private static HelloWorld port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear"); + return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear, jaxrpc-jbws1121-appclient.ear#jaxrpc-jbws1121-appclient.jar"); } public void setUp() throws Exception @@ -56,12 +57,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloWorldService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloWorldService"); port = (HelloWorld)service.getPort(HelloWorld.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCall() throws Exception { String response = port.echo("Hello"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) @@ -47,10 +47,11 @@ public class JBWS1125TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-client.jar"); + return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-appclient.ear#jaxrpc-jbws1125-appclient.jar"); } public void setUp() throws Exception @@ -58,12 +59,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testNoParamPart() throws Exception { String retObj = port.noParamPart(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) @@ -41,10 +41,11 @@ { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar"); + return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-appclient.ear#jaxrpc-jbws1148-appclient.jar"); } public void setUp() throws Exception @@ -52,12 +53,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCall() throws Exception { TelephoneNumber number = port.lookup("SomeName"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2012-03-01 14:43:48 UTC (rev 15803) @@ -40,24 +40,34 @@ public class JBWS1190TestCase extends JBossWSTest { private static final String ARCHIVE_NAME = "jaxrpc-jbws1190.war"; + private static InitialContext iniCtx; private static TestEndpoint port; public static Test suite() { - return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-client.jar"); + return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-appclient.ear#jaxrpc-jbws1190-appclient.jar"); } protected void setUp() throws Exception { if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testTestEndpoint() throws Exception { port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2012-03-01 14:43:48 UTC (rev 15803) @@ -29,6 +29,7 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.SPIProvider; @@ -45,7 +46,7 @@ public void testAddress(final String archive, final String service, final String scheme, final String port) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class, ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader()).getServerConfig(); File dataDir = serverConfig.getServerDataDir(); File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1107/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1107/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloWorldService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloWorldService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloWorldService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/application.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -13,8 +13,4 @@ </web> </module> - <module> - <java>jaxrpc-jbws1121-client.jar</java> - </module> - </application> \ No newline at end of file Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-app.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-app - PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" - "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> - -<jboss-app> - <loader-repository>jboss.ws.test:loader=JBWS1121</loader-repository> -</jboss-app> \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloWorldService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloWorldService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1121?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1124/WEB-INF/jboss-web.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -4,10 +4,6 @@ <jboss-web> - <class-loading> - <loader-repository>jbossws.jbws1124:domain=@jbws1124.domain@ </loader-repository> - </class-loading> - <context-root>/(a)jbws1124.domain@</context-root> </jboss-web> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1125/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1125?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -8,7 +8,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1148?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1190/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -5,7 +5,7 @@ <servlet> <servlet-name>ConfidentialEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpointImpl</servlet-class> </servlet> <servlet> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 13:51:30 UTC (rev 15802) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 14:43:48 UTC (rev 15803) @@ -1174,12 +1174,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude> @@ -1192,6 +1186,7 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> @@ -1215,11 +1210,10 @@ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15802 - in stack/native/branches/jbossws-native-4.0.x: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 08:51:30 -0500 (Thu, 01 Mar 2012) New Revision: 15802 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Merged revisions 15795 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15795 | alessio.soldano(a)jboss.com | 2012-03-01 11:59:10 +0100 (Thu, 01 Mar 2012) | 2 lines Fix assembly plugin configuration to avoid picking the same jbossws-native-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15795 Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-01 13:46:26 UTC (rev 15801) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-01 13:51:30 UTC (rev 15802) @@ -64,6 +64,13 @@ </dependency> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss711</classifier> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> @@ -108,6 +115,7 @@ <scope>provided</scope> </dependency> +  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 13:46:26 UTC (rev 15801) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 13:51:30 UTC (rev 15802) @@ -35,7 +35,6 @@ <include>org.jboss.ws.native:jbossws-native-client</include> <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> - <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss701</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>javax.jws:jsr181-api:jar</include> @@ -69,9 +68,7 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss701:jar</include> - <include>org.jboss.ws:jbossws-jboss702:jar</include> - <include>org.jboss.ws:jbossws-jboss710:jar</include> + <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> @@ -84,7 +81,7 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -95,25 +92,13 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include> + <include>org.jboss.ws.native:jbossws-native-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-01 13:46:26 UTC (rev 15801) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-01 13:51:30 UTC (rev 15802) @@ -41,13 +41,6 @@ <id>all</id> <goals><goal>jar</goal></goals> <phase>package</phase> - <configuration> - <excludes> - <exclude>**/jbossws-jboss701/**</exclude> - <exclude>**/jbossws-jboss702/**</exclude> - <exclude>**/jbossws-jboss710/**</exclude> - </excludes> - </configuration> </execution> <execution> <id>jboss701</id> @@ -76,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss711</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss711</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 13:46:26 UTC (rev 15801) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 13:51:30 UTC (rev 15802) @@ -160,7 +160,7 @@ </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-native-resources.jar"/> + <include name="**/jbossws-native-resources-(a){jbossid}.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15801 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 08:46:26 -0500 (Thu, 01 Mar 2012) New Revision: 15801 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -570,11 +570,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws82/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -584,6 +588,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws82-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws83/WEB-INF/web.xml"> @@ -598,11 +607,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws83/ClientHandler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws83/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -612,6 +626,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws83-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF/web.xml"> @@ -619,18 +638,25 @@ <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/*.wsdl"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*JavaBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -640,6 +666,11 @@ <include name="wsdl/*.wsdl"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws84-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws124/WEB-INF/web.xml"> @@ -2266,17 +2297,24 @@ <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2286,6 +2324,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws807-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws812/WEB-INF/web.xml"> @@ -2303,10 +2346,14 @@ <attribute name="Dependencies" value="org.jboss.ws.common"/> </manifest> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws812/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2316,6 +2363,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws812-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws950/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -42,10 +42,11 @@ public class JBWS807TestCase extends JBossWSTest { private static TestService_PortType port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); + return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-appclient.ear#jaxrpc-jbws807-appclient.jar"); } protected void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestService_PortType)service.getPort(TestService_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testPingMsg() throws Exception { try Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -67,7 +67,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar"); + return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-appclient.ear#jaxrpc-jbws812-appclient.jar"); } /** Send the raw bytes via an HttpURLConnection @@ -156,15 +156,24 @@ } - /** Test client proxy API - */ - public void testClientProxy() throws Exception + public void testAppclientProxy() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String resStr = port.echoSimple("\u00a0"); - assertEquals(160, resStr.charAt(0)); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String resStr = port.echoSimple("\u00a0"); + assertEquals(160, resStr.charAt(0)); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar"); + return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-appclient.ear#jaxrpc-jbws82-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar"); + return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-appclient.ear#jaxrpc-jbws83-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -54,7 +54,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar"); + return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-appclient.ear#jaxrpc-jbws84-appclient.jar"); } /** Use the JBoss generated dynamic proxy send the SOAP message. @@ -62,23 +62,34 @@ */ public void testProcessSOAPElement() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService"); - Message port = (Message)service.getPort(Message.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/MessageService"); + Message port = (Message)service.getPort(Message.class); - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessage reqMessage = factory.createMessage(); + MessageFactory factory = MessageFactory.newInstance(); + SOAPMessage reqMessage = factory.createMessage(); - DocumentBuilder builder = getDocumentBuilder(); - Document doc = builder.parse(new ByteArrayInputStream(Message.request.getBytes())); - reqMessage.getSOAPBody().addDocument(doc); + DocumentBuilder builder = getDocumentBuilder(); + Document doc = builder.parse(new ByteArrayInputStream(Message.request.getBytes())); + reqMessage.getSOAPBody().addDocument(doc); - SOAPEnvelope soapEnvelope = reqMessage.getSOAPPart().getEnvelope(); - SOAPBody soapBody = soapEnvelope.getBody(); - SOAPElement reqElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPEnvelope soapEnvelope = reqMessage.getSOAPPart().getEnvelope(); + SOAPBody soapBody = soapEnvelope.getBody(); + SOAPElement reqElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement resElement = port.processSOAPElement(reqElement); - validateResponse(resElement); + SOAPElement resElement = port.processSOAPElement(reqElement); + validateResponse(resElement); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws807?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws812?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws82/services/Foo?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws83?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -9,7 +9,7 @@ <display-name>Test web service</display-name> <service-ref> - <service-ref-name>service/MessageService</service-ref-name> + <service-ref-name>java:jboss/exported/service/MessageService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/MessageService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/MessageService</service-ref-name> + <service-ref-name>java:jboss/exported/service/MessageService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws84?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -1196,11 +1196,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude>

12 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012