2:50 a.m.
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 03:50:32 -0400 (Mon, 20 Apr 2009)
New Revision: 9838
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/metro/trunk/pom.xml
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml
===================================================================
---
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml 2009-04-20
07:37:05 UTC (rev 9837)
+++
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml 2009-04-20
07:50:32 UTC (rev 9838)
@@ -59,28 +59,8 @@
<include name="wsdl/*"/>
</webinf>
<metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
- <include name="server-*.jks"/>
<include name="services/**"/>
</metainf>
- </war>
-
- <!-- jaxws-samples-wsse-sign-50 -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-50.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
- <include name="wsit-*.xml"/>
- <include name="jboss-web.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
- <include name="services/**"/>
- </metainf>
<zipfileset
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"
includes="server-*.jks"
@@ -105,27 +85,7 @@
<include
name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
</classes>
<webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
- <include name="jboss-web.xml"/>
<include name="wsit-*.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
- <include name="server-*.jks"/>
- <include name="services/**"/>
- </metainf>
- </war>
-
- <!-- jaxws-samples-wsse-sign-encrypt-50 -->
- <war
-
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-50.war"
-
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
- <include name="wsit-*.xml"/>
<include name="jboss-web.xml"/>
<include name="wsdl/*"/>
</webinf>
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
---
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2009-04-20
07:37:05 UTC (rev 9837)
+++
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2009-04-20
07:50:32 UTC (rev 9838)
@@ -29,7 +29,6 @@
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -40,12 +39,13 @@
*/
public final class SignEncryptTestCase extends JBossWSTest
{
+
private final String serviceURL = "http://" + getServerHost() +
":8080/jaxws-samples-wsse-sign-encrypt/SecurityService";
public static Test suite()
{
- String serverJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ?
"jaxws-samples-wsse-sign-encrypt-50.war" :
"jaxws-samples-wsse-sign-encrypt.war";
- return new JBossWSTestSetup(SignEncryptTestCase.class,
"jaxws-samples-wsse-sign-encrypt-client.jar," + serverJar);
+ final String archives =
"jaxws-samples-wsse-sign-encrypt-client.jar,jaxws-samples-wsse-sign-encrypt.war";
+ return new JBossWSTestSetup(SignEncryptTestCase.class, archives);
}
public void test() throws Exception
@@ -56,4 +56,5 @@
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
assertEquals("Secure Hello World!", proxy.sayHello());
}
+
}
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
---
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2009-04-20
07:37:05 UTC (rev 9837)
+++
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2009-04-20
07:50:32 UTC (rev 9838)
@@ -29,7 +29,6 @@
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -44,8 +43,8 @@
public static Test suite()
{
- String serverJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ?
"jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war";
- return new JBossWSTestSetup(SignTestCase.class,
"jaxws-samples-wsse-sign-client.jar," + serverJar);
+ final String archives =
"jaxws-samples-wsse-sign-client.jar,jaxws-samples-wsse-sign-50.war" :
"jaxws-samples-wsse-sign.war";
+ return new JBossWSTestSetup(SignTestCase.class, archives);
}
public void test() throws Exception
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-04-20 07:37:05 UTC (rev 9837)
+++ stack/metro/trunk/pom.xml 2009-04-20 07:50:32 UTC (rev 9838)
@@ -44,7 +44,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.10.GA</jbossws.common.version>
+ <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
<jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version>