[jbossws-commits] JBossWS SVN: r15804 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 8 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Mar 1 10:17:44 EST 2012
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>
<!-- jbossws-jbws1093 -->
<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>
<!-- jaxrpc-jbws1107 -->
<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>
<!-- jaxrpc-jbws1303 -->
<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>
<!-- jaxrpc-jbws1316 -->
<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><!-- rewrite test -->
<exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude><!-- rewrite test -->
More information about the jbossws-commits
mailing list