[jbossws-commits] JBossWS SVN: r15803 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 12 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Mar 1 09:43:51 EST 2012
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>
<!-- jaxrpc-jbws1121 -->
<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>
<!-- jaxrpc-jbws1124one -->
@@ -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>
<!-- jaxrpc-jbws1148 -->
<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>
<!-- jbossws-jbws1179 -->
<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>
<!-- jaxrpcws-jbws1205 -->
<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>/@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><!-- rewrite test -->
<exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude><!-- rewrite test -->
<exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude><!-- review test -->
<exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude><!-- review test -->
@@ -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>
<!-- # [AS7-3946] waiting for jboss metadata 7.0.1.Final upgrade -->
<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>
More information about the jbossws-commits
mailing list