JBossWS SVN: r14650 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 15:53:51 -0400 (Thu, 30 Jun 2011)
New Revision: 14650
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-30 19:14:21 UTC (rev 14649)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-30 19:53:51 UTC (rev 14650)
@@ -776,6 +776,7 @@
<!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
<exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
<!-- # [JBWS-3252] Investigate WSA interop tests regression -->
@@ -785,36 +786,33 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- TODO: Classpath visibility issues - investigate -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+ <!-- TODO: Native webserviceref stuff -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+
+ <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!-- TODO: investigate failures -->
- <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
+ <!-- TODO: JMX client to AS7 server -->
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- # Fix webserviceref stuff -->
- <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
-
- <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
- <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
-
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
@@ -827,6 +825,9 @@
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <!-- JAXR not available -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
@@ -834,9 +835,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
-
- <!-- JAXR not available -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
</excludes>
</configuration>
</plugin>
13 years, 6 months
JBossWS SVN: r14649 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 15:14:21 -0400 (Thu, 30 Jun 2011)
New Revision: 14649
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
reordering excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-30 19:01:13 UTC (rev 14648)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-30 19:14:21 UTC (rev 14649)
@@ -785,14 +785,13 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
-
<!-- TODO: Classpath visibility issues - investigate -->
- <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+ <!-- TODO: Injections support for WS components -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
@@ -800,7 +799,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<!-- TODO: investigate failures -->
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
@@ -812,6 +810,11 @@
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
+
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
@@ -820,6 +823,10 @@
<!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
@@ -830,11 +837,6 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
- <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
</excludes>
</configuration>
</plugin>
13 years, 6 months
JBossWS SVN: r14648 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 15:01:13 -0400 (Thu, 30 Jun 2011)
New Revision: 14648
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating test excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-30 11:35:09 UTC (rev 14647)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-30 19:01:13 UTC (rev 14648)
@@ -797,17 +797,20 @@
<exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
+
+ <!-- TODO: investigate failures -->
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
+ <!-- TODO: will we support wars bundled in jars on AS7? -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
+
<!-- # Fix webserviceref stuff -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
13 years, 6 months
JBossWS SVN: r14647 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws1854 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 07:35:09 -0400 (Thu, 30 Jun 2011)
New Revision: 14647
Added:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
Removed:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java
Log:
[JBAS-9188] rollback previous commit
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 11:34:06 UTC (rev 14646)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 11:35:09 UTC (rev 14647)
@@ -501,10 +501,13 @@
<include name="jboss-web.xml" />
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.ear">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1854.war" />
</fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/META-INF">
+ <include name="jboss-service.xml" />
+ </metainf>
</jar>
<!-- jaxws-jbws1872 -->
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2011-06-30 11:34:06 UTC (rev 14646)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2011-06-30 11:35:09 UTC (rev 14647)
@@ -44,7 +44,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.ear");
+ return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.sar");
}
public void testPortAccess() throws Exception
Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml 2011-06-30 11:13:54 UTC (rev 14644)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml 2011-06-30 11:35:09 UTC (rev 14647)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
-</server>
Copied: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml (from rev 14644, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml)
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml 2011-06-30 11:35:09 UTC (rev 14647)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="urn:jboss:service:7.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
+</server>
13 years, 6 months
JBossWS SVN: r14646 - stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 07:34:06 -0400 (Thu, 30 Jun 2011)
New Revision: 14646
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
Log:
fixing jaxws-client artifact
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-06-30 11:26:29 UTC (rev 14645)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-06-30 11:34:06 UTC (rev 14646)
@@ -36,12 +36,7 @@
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.native.jbossws-native-factories" services="import"/>
- <module name="org.jboss.ws.native.jbossws-native-core" services="import">
- <imports>
- <include path="META-INF/jbossws-entities.properties"/>
- <include path="META-INF/standard-*-config.xml"/>
- </imports>
- </module>
+ <module name="org.jboss.ws.native.jbossws-native-core" services="import"/>
<module name="org.jboss.logging" />
</dependencies>
</module>
13 years, 6 months
JBossWS SVN: r14645 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws1854 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 07:26:29 -0400 (Thu, 30 Jun 2011)
New Revision: 14645
Removed:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java
Log:
[JBAS-9188] refactoring sar -> ear. Sars with nested archives are not supported on AS7
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 11:13:54 UTC (rev 14644)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 11:26:29 UTC (rev 14645)
@@ -501,13 +501,10 @@
<include name="jboss-web.xml" />
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1854.war" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/META-INF">
- <include name="jboss-service.xml" />
- </metainf>
</jar>
<!-- jaxws-jbws1872 -->
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2011-06-30 11:26:29 UTC (rev 14645)
@@ -44,7 +44,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.sar");
+ return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.ear");
}
public void testPortAccess() throws Exception
13 years, 6 months
JBossWS SVN: r14644 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 07:13:54 -0400 (Thu, 30 Jun 2011)
New Revision: 14644
Added:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml
Removed:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-sar/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-sar/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-sar/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-sar/
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
Log:
[JBAS-9188] refactoring sar -> ear. Sars with nested archives are not supported on AS7
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -607,35 +607,35 @@
<attribute name="Dependencies" value="org.jboss.logging"/>
</manifest>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase1.war" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase2.jar" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase3.war" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase4.jar" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -62,7 +62,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase1WithoutSar() throws Exception
+ public void testUsecase1WithoutEar() throws Exception
{
try
{
@@ -75,16 +75,16 @@
}
}
- public void testUsecase1WithSar() throws Exception
+ public void testUsecase1WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase1.sar");
+ deploy("jaxws-jbws2074-usecase1.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase1.sar");
+ undeploy("jaxws-jbws2074-usecase1.ear");
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -58,7 +58,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase2WithoutSar() throws Exception
+ public void testUsecase2WithoutEar() throws Exception
{
try
{
@@ -71,16 +71,16 @@
}
}
- public void testUsecase2WithSar() throws Exception
+ public void testUsecase2WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase2.sar");
+ deploy("jaxws-jbws2074-usecase2.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase2.sar");
+ undeploy("jaxws-jbws2074-usecase2.ear");
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -58,7 +58,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase3WithoutSar() throws Exception
+ public void testUsecase3WithoutEar() throws Exception
{
try
{
@@ -71,16 +71,16 @@
}
}
- public void testUsecase3WithSar() throws Exception
+ public void testUsecase3WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase3.sar");
+ deploy("jaxws-jbws2074-usecase3.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase3.sar");
+ undeploy("jaxws-jbws2074-usecase3.ear");
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -63,7 +63,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase4WithoutSar() throws Exception
+ public void testUsecase4WithoutEar() throws Exception
{
try
{
@@ -76,16 +76,16 @@
}
}
- public void testUsecase4WithSar() throws Exception
+ public void testUsecase4WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase4.sar");
+ deploy("jaxws-jbws2074-usecase4.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase4.sar");
+ undeploy("jaxws-jbws2074-usecase4.ear");
}
}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <web>
+ <web-uri>jaxws-jbws2074-usecase1.war</web-uri>
+ <context-root>/jaxws-jbws2074-usecase1</context-root>
+ </web>
+ </module>
+</application>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <java>jaxws-jbws2074-usecase2.jar</java>
+ </module>
+</application>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <web>
+ <web-uri>jaxws-jbws2074-usecase3.war</web-uri>
+ <context-root>/jaxws-jbws2074-usecase3</context-root>
+ </web>
+ </module>
+</application>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <java>jaxws-jbws2074-usecase4.jar</java>
+ </module>
+</application>
13 years, 6 months
JBossWS SVN: r14643 - common/trunk/src/main/java/org/jboss/ws/common/utils.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-30 06:19:05 -0400 (Thu, 30 Jun 2011)
New Revision: 14643
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
Log:
allow for schemas/dtds lookup in custom classloader
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2011-06-29 14:38:53 UTC (rev 14642)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2011-06-30 10:19:05 UTC (rev 14643)
@@ -151,6 +151,26 @@
return inputSource;
}
+
+ protected InputStream loadClasspathResource(String resource, boolean trace)
+ {
+ InputStream is = super.loadClasspathResource(resource, trace);
+ if (is == null)
+ {
+ final ClassLoader origLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
+ is = super.loadClasspathResource(resource, trace);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(origLoader);
+ }
+ }
+
+ return is;
+ }
/** Use a ResourceURL to access the resource.
* This method should be protected in the super class. */
13 years, 6 months
JBossWS SVN: r14642 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws1581 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-29 10:38:53 -0400 (Wed, 29 Jun 2011)
New Revision: 14642
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
Log:
do not bundle jboss-web.xml for AS7 runtime - it contains class-loading element that AS7 doesn't recognize
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-29 14:37:40 UTC (rev 14641)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-29 14:38:53 UTC (rev 14642)
@@ -16,7 +16,7 @@
<target name="build-jars-jaxws" description="Build the deployments.">
- <mkdir dir="${tests.output.dir}/test-libs" />
+ <mkdir dir="${tests.output.dir}/test-libs/as6" />
<!-- jaxws-anonymous -->
<war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml">
@@ -254,7 +254,7 @@
</jar>
<!-- jaxws-jbws1581 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml">
+ <war warfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" />
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" />
@@ -263,6 +263,20 @@
<include name="jboss-web.xml" />
</webinf>
</war>
+ <jar jarfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581.ear">
+ <fileset dir="${tests.output.dir}/test-libs/as6">
+ <include name="jaxws-jbws1581-pojo.war" />
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF">
+ <include name="jboss-app.xml" />
+ </metainf>
+ </jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" />
+ </classes>
+ </war>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1581-pojo.war" />
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-06-29 14:37:40 UTC (rev 14641)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-06-29 14:38:53 UTC (rev 14642)
@@ -43,7 +43,10 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar");
+ String archives = isTargetJBoss6()
+ ? "as6/jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"
+ : "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar";
+ return new JBossWSTestSetup(JBWS1581EarTestCase.class, archives);
}
public void testWSDLAccess() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-06-29 14:37:40 UTC (rev 14641)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-06-29 14:38:53 UTC (rev 14642)
@@ -43,7 +43,10 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar");
+ String archives = isTargetJBoss6()
+ ? "as6/jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"
+ : "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar";
+ return new JBossWSTestSetup(JBWS1581WarTestCase.class, archives);
}
public void testWSDLAccess() throws Exception
13 years, 6 months
JBossWS SVN: r14641 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-29 10:37:40 -0400 (Wed, 29 Jun 2011)
New Revision: 14641
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-29 06:35:15 UTC (rev 14640)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-29 14:37:40 UTC (rev 14641)
@@ -789,9 +789,6 @@
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <!-- TODO: Unexpected element 'class-loading' encountered -->
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
-
<!-- TODO: Classpath visibility issues - investigate -->
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
@@ -826,6 +823,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
13 years, 6 months