JBossWS SVN: r7041 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-15 07:42:10 -0400 (Thu, 15 May 2008)
New Revision: 7041
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2181] Enable tests
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-15 11:40:32 UTC (rev 7040)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-15 11:42:10 UTC (rev 7041)
@@ -88,7 +88,3 @@
# [JBWS-2177] Endorsed mechanism issue
org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2181] metro wsse tests fail on AS 5.0.x
-org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
-org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-15 11:40:32 UTC (rev 7040)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-15 11:42:10 UTC (rev 7041)
@@ -103,7 +103,3 @@
# [JBWS-2177] Endorsed mechanism issue
org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2181] metro wsse tests fail on AS 5.0.x
-org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
-org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
16 years, 7 months
JBossWS SVN: r7040 - in stack/metro/trunk/modules/testsuite/metro-tests/src: test/java/org/jboss/test/ws/jaxws/samples/wsse and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-15 07:40:32 -0400 (Thu, 15 May 2008)
New Revision: 7040
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/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
Log:
[JBWS-2181] Move keystores to WEB-INF/classes
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-05-15 11:13:33 UTC (rev 7039)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-05-15 11:40:32 UTC (rev 7040)
@@ -57,6 +57,8 @@
</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="server-*.jks"/>
@@ -66,6 +68,31 @@
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl"
prefix="WEB-INF/wsdl"/>
</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"
+ prefix="WEB-INF/classes/META-INF"/>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
<include name="client-*.jks"/>
@@ -83,16 +110,40 @@
<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>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="services/**"/>
+ </metainf>
<zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"
+ includes="server-*.jks"
+ prefix="WEB-INF/classes/META-INF"/>
</war>
+
+ <!-- jaxws-samples-wsse-sign-encrypt-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
<include name="client-*.jks"/>
@@ -119,6 +170,8 @@
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl"
prefix="WEB-INF/wsdl"/>
</war>
+
+ <!-- jaxws-samples-wsse-username-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
<include name="wsit-client.xml"/>
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 2008-05-15 11:13:33 UTC (rev 7039)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-05-15 11:40:32 UTC (rev 7040)
@@ -26,7 +26,6 @@
import java.net.URLClassLoader;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
@@ -48,7 +47,7 @@
public static Test suite()
{
addClientConfToClasspath("jaxws-samples-wsse-sign-encrypt-client.jar");
- return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt.war");
+ return new JBossWSTestSetup(SignEncryptTestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-wsse-sign-encrypt-50.war" : "jaxws-samples-wsse-sign-encrypt.war");
}
public void test() throws Exception
@@ -57,10 +56,6 @@
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
-// BindingProvider bp = (BindingProvider)proxy;
-// bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit");
-// bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
-
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 2008-05-15 11:13:33 UTC (rev 7039)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-05-15 11:40:32 UTC (rev 7040)
@@ -47,7 +47,7 @@
public static Test suite()
{
addClientConfToClasspath("jaxws-samples-wsse-sign-client.jar");
- return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign.war");
+ return new JBossWSTestSetup(SignTestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war");
}
public void test() throws Exception
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml 2008-05-15 11:40:32 UTC (rev 7040)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxws-samples-wsse-sign</context-root>
+</jboss-web>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml 2008-05-15 11:40:32 UTC (rev 7040)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxws-samples-wsse-sign-encrypt</context-root>
+</jboss-web>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
JBossWS SVN: r7039 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-15 07:13:33 -0400 (Thu, 15 May 2008)
New Revision: 7039
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2181] exclude tests
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-15 09:38:49 UTC (rev 7038)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-15 11:13:33 UTC (rev 7039)
@@ -88,3 +88,7 @@
# [JBWS-2177] Endorsed mechanism issue
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2181] metro wsse tests fail on AS 5.0.x
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-15 09:38:49 UTC (rev 7038)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-15 11:13:33 UTC (rev 7039)
@@ -103,3 +103,7 @@
# [JBWS-2177] Endorsed mechanism issue
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2181] metro wsse tests fail on AS 5.0.x
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
16 years, 7 months
JBossWS SVN: r7038 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-15 05:38:49 -0400 (Thu, 15 May 2008)
New Revision: 7038
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
disable fork mode per test again
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-15 09:12:46 UTC (rev 7037)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-15 09:38:49 UTC (rev 7038)
@@ -140,8 +140,8 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- http://jira.jboss.org/jira/browse/JBWS-2176 -->
- <forkMode>pertest</forkMode>
+ <!-- http://jira.jboss.org/jira/browse/JBWS-2176
+ <forkMode>pertest</forkMode-->
<systemProperties>
<property>
<name>java.naming.provider.url</name>
16 years, 7 months
JBossWS SVN: r7037 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-15 05:12:46 -0400 (Thu, 15 May 2008)
New Revision: 7037
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
enable fork mode per test for a while
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-14 20:19:10 UTC (rev 7036)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-15 09:12:46 UTC (rev 7037)
@@ -140,8 +140,8 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- http://jira.jboss.org/jira/browse/JBWS-2176
- <forkMode>pertest</forkMode-->
+ <!-- http://jira.jboss.org/jira/browse/JBWS-2176 -->
+ <forkMode>pertest</forkMode>
<systemProperties>
<property>
<name>java.naming.provider.url</name>
16 years, 7 months
JBossWS SVN: r7036 - stack/native/trunk/modules/testsuite/framework-tests.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-14 16:19:10 -0400 (Wed, 14 May 2008)
New Revision: 7036
Modified:
stack/native/trunk/modules/testsuite/framework-tests/
Log:
ignore tools output
Property changes on: stack/native/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
- target
+ target
wsprovide
work
wsconsume
16 years, 8 months
JBossWS SVN: r7035 - stack/native/trunk/modules/testsuite/native-tests.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-14 16:18:13 -0400 (Wed, 14 May 2008)
New Revision: 7035
Modified:
stack/native/trunk/modules/testsuite/native-tests/
Log:
ignore tools output
Property changes on: stack/native/trunk/modules/testsuite/native-tests
___________________________________________________________________
Name: svn:ignore
- target
+ target
tools
wstools
16 years, 8 months
JBossWS SVN: r7034 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-14 15:24:03 -0400 (Wed, 14 May 2008)
New Revision: 7034
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2180] use maven dependency instead of additionaClasspathElements
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-14 16:51:45 UTC (rev 7033)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-14 19:24:03 UTC (rev 7034)
@@ -43,7 +43,6 @@
<artifactId>jbossws-native-embedded</artifactId>
<version>${version}</version>
</dependency>
-
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
@@ -51,7 +50,6 @@
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
-
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
@@ -76,6 +74,13 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <!-- required for WS-RM client backports server -->
+ <dependency>
+ <groupId>jboss.web</groupId>
+ <artifactId>jbossweb</artifactId>
+ <version>2.1.0.GA</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
@@ -290,10 +295,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
- <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/server/default/deploy/jboss-web.deployer/jbossweb.jar</additionalClasspathElement>
- </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -334,10 +335,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
- <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/server/default/deploy/jboss-web.deployer/jbossweb.jar</additionalClasspathElement>
- </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -383,10 +380,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
- <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/server/default/deployers/jbossweb.deployer/jbossweb.jar</additionalClasspathElement>
- </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -432,10 +425,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
- <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
- <additionalClasspathElements>
- <additionalClasspathElement>${jboss.home}/server/default/deploy/jbossweb.sar/jbossweb.jar</additionalClasspathElement>
- </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
16 years, 8 months
JBossWS SVN: r7033 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-14 12:51:45 -0400 (Wed, 14 May 2008)
New Revision: 7033
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2180] enabling WS-RM test suite
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-14 16:37:15 UTC (rev 7032)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-14 16:51:45 UTC (rev 7033)
@@ -290,6 +290,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
+ <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/server/default/deploy/jboss-web.deployer/jbossweb.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -330,6 +334,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
+ <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/server/default/deploy/jboss-web.deployer/jbossweb.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -375,6 +383,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/server/default/deployers/jbossweb.deployer/jbossweb.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
@@ -420,6 +432,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ <!-- http://jira.jboss.org/jira/browse/JBWS-2180 -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/server/default/deploy/jbossweb.sar/jbossweb.jar</additionalClasspathElement>
+ </additionalClasspathElements>
</configuration>
</plugin>
</plugins>
16 years, 8 months
JBossWS SVN: r7032 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm: oneway and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-14 12:37:15 -0400 (Wed, 14 May 2008)
New Revision: 7032
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
Log:
refactoring - removed reflection code
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java 2008-05-14 14:04:58 UTC (rev 7031)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/Helper.java 2008-05-14 16:37:15 UTC (rev 7032)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.wsrm;
-import java.lang.reflect.Method;
import java.net.URI;
import java.net.URISyntaxException;
import javax.xml.ws.BindingProvider;
@@ -84,16 +83,4 @@
}
}
- /**
- * Invokes method using java reflection api
- * @throws Exception if some reflection related problem occurs
- */
- public static Object invokeMethodUsingReflection(String ifaceName, Object object, String methodName, Class<?>[] parametersSignature, Object[] parameters)
- throws Exception
- {
- Object castedObject = Class.forName(ifaceName).cast(object);
- Method castedObjectMethod = castedObject.getClass().getMethod(methodName, parametersSignature);
- return castedObjectMethod.invoke(castedObject, parameters);
- }
-
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2008-05-14 14:04:58 UTC (rev 7031)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2008-05-14 16:37:15 UTC (rev 7032)
@@ -21,12 +21,15 @@
*/
package org.jboss.test.ws.jaxws.wsrm.oneway;
-import static org.jboss.test.ws.jaxws.wsrm.Helper.invokeMethodUsingReflection;
import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
import java.net.URL;
+
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface;
@@ -49,16 +52,7 @@
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (OneWayServiceIface)service.getPort(OneWayServiceIface.class);
- if (isIntegrationNative())
- {
- // set up client config to be used - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.core.StubExt",
- proxy, "setConfigName",
- new Class[] { String.class, String.class },
- new Object[] {getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"}
- );
- }
+ ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml");
}
public void testOneWayMethods() throws Exception
@@ -69,18 +63,9 @@
proxy.method2("Hello World");
setAddrProps(proxy, "http://useless/action3", serviceURL);
proxy.method3(new String[] {"Hello","World"});
- if (isIntegrationNative())
- {
- // force close sequence - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.extensions.wsrm.api.RMProvider",
- proxy, "closeSequence",
- new Class[] {},
- new Object[] {}
- );
- }
+ ((RMProvider)proxy).closeSequence();
}
-
+
public static String getClasspath()
{
return "jaxws-wsrm.war, jaxws-wsrm-client.jar";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2008-05-14 14:04:58 UTC (rev 7031)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2008-05-14 16:37:15 UTC (rev 7032)
@@ -21,13 +21,14 @@
*/
package org.jboss.test.ws.jaxws.wsrm.oneway;
-import static org.jboss.test.ws.jaxws.wsrm.Helper.invokeMethodUsingReflection;
import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -49,16 +50,7 @@
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (SecuredOneWayServiceIface)service.getPort(SecuredOneWayServiceIface.class);
- if (isIntegrationNative())
- {
- // set up client config to be used - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.core.StubExt",
- proxy, "setConfigName",
- new Class[] { String.class, String.class },
- new Object[] {getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"}
- );
- }
+ ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml");
}
public void testOneWayMethods() throws Exception
@@ -69,16 +61,7 @@
proxy.method2("Hello World");
setAddrProps(proxy, "http://useless/action3", serviceURL);
proxy.method3(new String[] {"Hello","World"});
- if (isIntegrationNative())
- {
- // force close sequence - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.extensions.wsrm.api.RMProvider",
- proxy, "closeSequence",
- new Class[] {},
- new Object[] {}
- );
- }
+ ((RMProvider)proxy).closeSequence();
}
public static String getClasspath()
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2008-05-14 14:04:58 UTC (rev 7031)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2008-05-14 16:37:15 UTC (rev 7032)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.wsrm.reqres;
-import static org.jboss.test.ws.jaxws.wsrm.Helper.invokeMethodUsingReflection;
import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
import java.net.URL;
@@ -34,6 +33,9 @@
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
import javax.xml.ws.Service;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface;
@@ -72,16 +74,7 @@
Service service = Service.create(wsdlURL, serviceName);
service.setExecutor(testExecutor);
proxy = (ReqResServiceIface)service.getPort(ReqResServiceIface.class);
- if (isIntegrationNative())
- {
- // set up client config to be used - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.core.StubExt",
- proxy, "setConfigName",
- new Class[] { String.class, String.class },
- new Object[] {getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"}
- );
- }
+ ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml");
}
}
@@ -160,16 +153,7 @@
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- if (isIntegrationNative())
- {
- // force close sequence - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.extensions.wsrm.api.RMProvider",
- proxyObject, "closeSequence",
- new Class[] {},
- new Object[] {}
- );
- }
+ ((RMProvider)proxy).closeSequence();
}
public static String getClasspath()
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2008-05-14 14:04:58 UTC (rev 7031)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2008-05-14 16:37:15 UTC (rev 7032)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.wsrm.reqres;
-import static org.jboss.test.ws.jaxws.wsrm.Helper.invokeMethodUsingReflection;
import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
import java.net.URL;
@@ -35,6 +34,8 @@
import javax.xml.ws.Response;
import javax.xml.ws.Service;
import org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -72,16 +73,7 @@
Service service = Service.create(wsdlURL, serviceName);
service.setExecutor(testExecutor);
proxy = (SecuredReqResServiceIface)service.getPort(SecuredReqResServiceIface.class);
- if (isIntegrationNative())
- {
- // set up client config to be used - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.core.StubExt",
- proxy, "setConfigName",
- new Class[] { String.class, String.class },
- new Object[] {getConfigName(), "META-INF/wsrm-jaxws-client-config.xml"}
- );
- }
+ ((StubExt)proxy).setConfigName(getConfigName(), "META-INF/wsrm-jaxws-client-config.xml");
}
}
@@ -160,16 +152,7 @@
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- if (isIntegrationNative())
- {
- // force close sequence - uses jbossws specific API via reflection
- invokeMethodUsingReflection(
- "org.jboss.ws.extensions.wsrm.api.RMProvider",
- proxyObject, "closeSequence",
- new Class[] {},
- new Object[] {}
- );
- }
+ ((RMProvider)proxy).closeSequence();
}
public static String getClasspath()
16 years, 8 months