[jbossws-commits] JBossWS SVN: r15826 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Mar 2 05:04:33 EST 2012
Author: ropalka
Date: 2012-03-02 05:04:32 -0500 (Fri, 02 Mar 2012)
New Revision: 15826
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.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/wsse/NotEncodedTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[AS7-3444] enabling appclient tests - FINAL COMMIT
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-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -3363,7 +3363,7 @@
</war>
<jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes*.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
<include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
</fileset>
@@ -3547,13 +3547,18 @@
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-client.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_*.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.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/wsse/account-signup/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
@@ -3564,6 +3569,11 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-account-signup-appclient.jar"/>
+ </fileset>
+ </jar>
<!-- jaxrpc-wsse-rpc.war -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
@@ -3586,12 +3596,16 @@
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-client.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/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/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
@@ -3602,12 +3616,21 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-client.jar">
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-rpc-appclient.jar"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/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/wsse/rpc/META-INF">
<include name="application-client.xml"/>
</metainf>
@@ -3619,6 +3642,11 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-rpc-none-appclient.jar"/>
+ </fileset>
+ </jar>
<!-- jaxrpc-wsse-simple-sign-encrypt -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
@@ -3643,12 +3671,16 @@
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/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/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
@@ -3661,6 +3693,11 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-simple-sign-encrypt-appclient.jar"/>
+ </fileset>
+ </jar>
<!-- jaxrpc-wsse-sign-fault.war -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
@@ -3685,12 +3722,16 @@
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-client.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/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/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
@@ -3703,6 +3744,11 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-sign-fault-appclient.jar"/>
+ </fileset>
+ </jar>
<!-- jaxrpc-wsse-sign-encrypt-fault.war -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
@@ -3727,12 +3773,16 @@
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/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/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
@@ -3745,6 +3795,11 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-sign-encrypt-fault-appclient.jar"/>
+ </fileset>
+ </jar>
<!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war -->
<replace file="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
@@ -3830,6 +3885,7 @@
<metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
+ <include name="jboss-ejb3.xml"/>
<include name="jboss-webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-wsse-server.xml"/>
@@ -3841,12 +3897,18 @@
<include name="wsse.truststore"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-client.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/wsse/JaxRpcTestService*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/wsse/SimpleUserType.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/wsse/username/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
@@ -3855,6 +3917,11 @@
<include name="wsdl/**"/>
</metainf>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxrpc-wsse-username-appclient.jar"/>
+ </fileset>
+ </jar>
<!-- jaxrpc-xop-doclit without handlers -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -44,7 +44,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-client.jar");
+ return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-appclient.ear#jaxrpc-wsse-rpc-none-appclient.jar");
}
/**
@@ -52,20 +52,31 @@
*/
public void testEndpoint() throws Exception
{
- InitialContext iniCtx = getAppclientInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
- Hello hello = (Hello)service.getPort(Hello.class);
-
+ InitialContext iniCtx = null;
try
{
- UserType in0 = new UserType("Kermit");
- hello.echoUserType(in0);
- fail("RemoteException expected");
+ iniCtx = getAppclientInitialContext();
+ Service service = (Service)iniCtx.lookup("java:service/HelloService");
+ Hello hello = (Hello)service.getPort(Hello.class);
+
+ try
+ {
+ UserType in0 = new UserType("Kermit");
+ hello.echoUserType(in0);
+ fail("RemoteException expected");
+ }
+ catch (RemoteException ex)
+ {
+ String message = ex.getMessage();
+ assertTrue("Unexpected message: " + message, message.indexOf("requires <wsse:Security>") >= 0);
+ }
}
- catch (RemoteException ex)
+ finally
{
- String message = ex.getMessage();
- assertTrue("Unexpected message: " + message, message.indexOf("requires <wsse:Security>") >= 0);
+ if (iniCtx != null)
+ {
+ iniCtx.close();
+ }
}
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -36,19 +36,32 @@
*/
public class RpcTestCase extends JBossWSTest
{
- /** Construct the test case with a given name
- */
- /** Deploy the test */
+ private static InitialContext iniCtx = null;
+
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-client.jar");
+ return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-appclient.ear#jaxrpc-wsse-rpc-appclient.jar");
}
+ protected void setUp() throws Exception
+ {
+ iniCtx = getAppclientInitialContext();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ if (iniCtx != null)
+ {
+ iniCtx.close();
+ iniCtx = null;
+ }
+ super.tearDown();
+ }
+
public void testEndpoint() throws Exception
{
- InitialContext iniCtx = getAppclientInitialContext();
- 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 in0 = new UserType("Kermit");
@@ -58,8 +71,7 @@
public void testFault() throws Exception
{
- InitialContext iniCtx = getAppclientInitialContext();
- 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);
HelloException exception = null;
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -37,6 +37,6 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-client.jar");
+ return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-appclient.ear#jaxrpc-wsse-sign-encrypt-fault-appclient.jar");
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -37,6 +37,6 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-client.jar");
+ return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-appclient.ear#jaxrpc-wsse-sign-fault-appclient.jar");
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -45,6 +45,7 @@
private String trustStorePassword;
private String keyStoreType;
private String trustStoreType;
+ private static InitialContext iniCtx;
/** Construct the test case with a given name
*/
@@ -52,13 +53,28 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-client.jar");
+ return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-appclient.ear#jaxrpc-wsse-simple-sign-encrypt-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 testEndpoint() throws Exception
{
- InitialContext iniCtx = getAppclientInitialContext();
- 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 in0 = new UserType("Kermit");
@@ -71,8 +87,7 @@
clearEnvironment();
try
{
- InitialContext iniCtx = getAppclientInitialContext();
- 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 in0 = new UserType("Kermit");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -50,7 +50,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar");
+ return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-appclient.ear#jaxrpc-wsse-username-appclient.jar", true);
}
protected void setUp() throws Exception
@@ -60,8 +60,9 @@
if (port == null)
{
InitialContext iniCtx = getAppclientInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB");
+ Service service = (Service)iniCtx.lookup("java:service/TestServiceEJB");
port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class);
+ iniCtx.close();
}
//Backup values
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 10:04:32 UTC (rev 15826)
@@ -38,35 +38,46 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-client.jar");
+ return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-appclient.ear#jaxrpc-wsse-account-signup-appclient.jar");
}
public void testEndpoint() throws Exception
{
- InitialContext iniCtx = getAppclientInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService");
- AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class);
+ InitialContext iniCtx = null;
+ try
+ {
+ iniCtx = getAppclientInitialContext();
+ Service service = (Service)iniCtx.lookup("java:service/AccountSignupService");
+ AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class);
- AccountInfo account = new AccountInfo();
- account.setFirstName("Jason");
- account.setLastName("Greene");
- Address address = new Address();
- address.setCity("Madison");
- address.setStreet("Some street");
- address.setZip("53717");
- account.setAddress(address);
+ AccountInfo account = new AccountInfo();
+ account.setFirstName("Jason");
+ account.setLastName("Greene");
+ Address address = new Address();
+ address.setCity("Madison");
+ address.setStreet("Some street");
+ address.setZip("53717");
+ account.setAddress(address);
- CreditCardInfo credit = new CreditCardInfo();
- credit.setCreditCardNumber("1234-1234-1234-1234");
- Calendar cal = Calendar.getInstance();
- cal.clear();
- cal.set(2005, 11, 1, 0, 0);
+ CreditCardInfo credit = new CreditCardInfo();
+ credit.setCreditCardNumber("1234-1234-1234-1234");
+ Calendar cal = Calendar.getInstance();
+ cal.clear();
+ cal.set(2005, 11, 1, 0, 0);
- credit.setExpiration(cal.getTime());
- credit.setSecurityCode("123");
- account.setCreditCardInfo(credit);
+ credit.setExpiration(cal.getTime());
+ credit.setSecurityCode("123");
+ account.setCreditCardInfo(credit);
- int result = signup.signup(account, 0.0f, new Date());
- assertTrue(result == 345);
+ int result = signup.signup(account, 0.0f, new Date());
+ assertTrue(result == 345);
+ }
+ finally
+ {
+ if (iniCtx != null)
+ {
+ iniCtx.close();
+ }
+ }
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -8,7 +8,7 @@
<display-name>AccountSignupService</display-name>
<service-ref>
- <service-ref-name>service/AccountSignupService</service-ref-name>
+ <service-ref-name>java:jboss/exported/service/AccountSignupService</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
<wsdl-file>META-INF/wsdl/AccountSignupService.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/wsse/account-signup/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -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/AccountSignupService</service-ref-name>
+ <service-ref-name>java:jboss/exported/service/AccountSignupService</service-ref-name>
<config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-account-signup?wsdl</wsdl-override>
</service-ref>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -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/wsse/rpc/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -3,11 +3,10 @@
<!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/HelloService</service-ref-name>
- <config-name>Standard WSSecurity Client</config-name>
+ <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name>
+ <config-name>Standard WSSecurity Client</config-name>
<wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc?wsdl</wsdl-override>
</service-ref>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -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-wsse-rpc?wsdl</wsdl-override>
</service-ref>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -8,7 +8,7 @@
<display-name>JAXRPC simple tests</display-name>
<service-ref>
- <service-ref-name>service/TestServiceEJB</service-ref-name>
+ <service-ref-name>java:jboss/exported/service/TestServiceEJB</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/wsse/username/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -3,10 +3,9 @@
<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
<service-ref>
- <service-ref-name>service/TestServiceEJB</service-ref-name>
+ <service-ref-name>java:jboss/exported/service/TestServiceEJB</service-ref-name>
<config-name>Standard WSSecurity Client</config-name>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsse.JaxRpcTestService</service-endpoint-interface>
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<jboss:jboss
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:spec="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd
+ http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd"
+ version="3.1"
+ impl-version="2.0">
+
+ <spec:assembly-descriptor>
+ <security xmlns="urn:security">
+ <spec:ejb-name>TestService</spec:ejb-name>
+ <security-domain>JBossWS</security-domain>
+ </security>
+ <spec:security-role>
+ <spec:role-name>friend</spec:role-name>
+ </spec:security-role>
+ </spec:assembly-descriptor>
+
+</jboss:jboss>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 09:19:05 UTC (rev 15825)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 10:04:32 UTC (rev 15826)
@@ -1164,25 +1164,18 @@
<exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude>
- <!-- # TODO: investigate failure -->
- <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude>
-
- <!-- # webservices-description in jboss-web.xml / jboss.xml -->
- <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase*</exclude>
- <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>
-
<!-- # [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>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
+ <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/UsernameTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
</excludes>
</configuration>
More information about the jbossws-commits
mailing list