[jbossws-commits] JBossWS SVN: r6757 - in stack/metro/branches/tdiesler/trunk: modules/client and 9 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Apr 29 15:56:40 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-29 15:56:39 -0400 (Tue, 29 Apr 2008)
New Revision: 6757
Added:
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
Modified:
stack/metro/branches/tdiesler/trunk/.classpath
stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/metro/branches/tdiesler/trunk/pom.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
metro tests ok
Modified: stack/metro/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 19:56:39 UTC (rev 6757)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="modules/testsuite/metro-tests/src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
Modified: stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -64,6 +64,10 @@
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
<artifactId>txnannprocessor</artifactId>
</dependency>
<dependency>
Modified: stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -85,6 +85,10 @@
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
<artifactId>txnannprocessor</artifactId>
</dependency>
<dependency>
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -54,6 +54,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -75,6 +83,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -96,6 +112,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -117,6 +141,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ============================================================================== -->
+ <!-- Building -->
+ <!-- -->
+ <!-- Where to create your tests -->
+ <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
+ <!-- -->
+ <!-- ============================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jbws1869 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/>
+ </classes>
+ </war>
+
+ <!-- jbws1871 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/>
+ </classes>
+ </war>
+
+ <!-- wsit-rm -->
+ <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/Add.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF">
+ <include name="sun-web.xml"/>
+ <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
+ </webinf>
+ </war>
+
+ </target>
+
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-samples-wsa -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.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"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="server-*.jks"/>
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <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"/>
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-sign-encrypt -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.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"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="server-*.jks"/>
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <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"/>
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-username -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/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/username/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <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"/>
+ </metainf>
+ </jar>
+
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -56,33 +56,12 @@
<priority value="DEBUG"/>
</category>
- <category name="org.jboss.ws.core.MessageTrace">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <!-- Apache security is verbose -->
- <category name="org.apache.xml.security">
- <priority value="INFO"/>
- </category>
-
- <!--
- <category name="org.jboss.xb">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
<root>
-<!--
- <appender-ref ref="CONSOLE"/>
--->
+ <!--appender-ref ref="CONSOLE"/-->
<appender-ref ref="FILE"/>
</root>
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -78,4 +78,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -78,4 +78,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -84,4 +84,5 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -99,3 +99,5 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -50,8 +50,8 @@
<artifactId>ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
Modified: stack/metro/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -209,6 +209,11 @@
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
<artifactId>wsit-rt</artifactId>
<version>${sun.wsit.version}</version>
</dependency>
Modified: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -88,6 +88,7 @@
<include name="**/jsr173_api.jar"/>
<include name="**/jsr250-api.jar"/>
<include name="**/mimepull.jar"/>
+ <include name="**/resolver.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
<include name="**/sjsxp.jar"/>
@@ -96,7 +97,6 @@
<include name="**/streambuffer.jar"/>
<include name="**/txnannprocessor.jar"/>
<include name="**/wsdl4j.jar"/>
- <include name="**/wsit-resolver.jar"/>
<include name="**/wstx.jar"/>
<include name="**/xmldsig.jar"/>
<include name="**/xmlsec.jar"/>
Modified: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -80,6 +80,7 @@
<include>*:jsr173_api:jar</include>
<include>*:jsr250-api:jar</include>
<include>*:mimepull:jar</include>
+ <include>*:resolver:jar</include>
<include>*:saaj-api:jar</include>
<include>*:saaj-impl:jar</include>
<include>*:sjsxp:jar</include>
More information about the jbossws-commits
mailing list