[jbossws-commits] JBossWS SVN: r15797 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 10 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Mar 1 06:05:58 EST 2012
Author: ropalka
Date: 2012-03-01 06:05:57 -0500 (Thu, 01 Mar 2012)
New Revision: 15797
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/jbws316/JBWS316TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/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 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -955,12 +955,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"/>
@@ -970,6 +974,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>
<!-- jaxrpc-jbws331 -->
<jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ws.jar">
@@ -1017,7 +1026,7 @@
<include name="jaxrpc-jbws331-client.jar"/>
</fileset>
</ear>
-
+
<!-- jaxrpc-jbws349 -->
<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">
@@ -1030,12 +1039,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"/>
@@ -1045,6 +1058,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>
<!-- jaxrpc-jbws358 -->
<jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar">
@@ -1103,13 +1121,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"/>
@@ -1119,6 +1141,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>
<!-- jaxrpc-jbws381 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws381/WEB-INF/web.xml">
@@ -1132,12 +1159,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"/>
@@ -1147,6 +1178,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>
<!-- jaxrpc-jbws383 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws383/WEB-INF/web.xml">
@@ -1161,11 +1197,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"/>
@@ -1175,6 +1215,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>
<!-- jaxrpc-jbws413 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/web.xml">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/jbws377/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/jbws383/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -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/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:04:50 UTC (rev 15796)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:05:57 UTC (rev 15797)
@@ -1192,12 +1192,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/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/jbws331/JBWS331TestCase*</exclude><!-- rewrite test -->
<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>
More information about the jbossws-commits
mailing list