Author: thomas.diesler(a)jboss.com Date: 2008-04-29 14:56:16 -0400 (Tue, 29 Apr 2008) New Revision: 6756 Modified: stack/metro/branches/tdiesler/trunk/modules/wsit/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: deploy-jboss422, ok Modified: stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml 2008-04-29 17:17:10 UTC (rev 6755) +++ stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml 2008-04-29 18:56:16 UTC (rev 6756) @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - Stack Metro WSIT</name> + <name>JBoss Web Services - Stack Metro Interoperability</name> <artifactId>jbossws-metro-wsit</artifactId> <packaging>pom</packaging> Modified: stack/metro/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 17:17:10 UTC (rev 6755) +++ stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 18:56:16 UTC (rev 6756) @@ -11,68 +11,6 @@ <!-- $Id$ --> -<!-- - The JBossWS project is organised like this - - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+ - Target Container: | AS-5.0 | | AS-4.2 | | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | | - WS Framework: | jbossws-spi, jbossws-framework, jbossws-common | | | - +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - WS Stack Integration: | jbossws-native | | jbossws-metro | | jbossws-cxf | | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - WS Stack: | jbossws-core | | Sun Metro | | Apache CXF | | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - | | | | | | | | | | | | | | - +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+ - JAXWS Testsuite - - - Typically you would build, deploy, test one of the WS stacks against one of the supported target containers. - Here we explain first the manual procedure. Further down you find instruction on how to do this using our - automated Hudson QA environment. - - Working with JBossWS - ~~~~~~~~~~~~~~~~~~~~ - - To run the general JAXWS samples against our web service stack on JBoss-5.0 you would run the sequence below. - This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly. - - ant deploy-jboss500 - mvn -Ptestsuite,jboss500 test - - Working with the Hudson QA environment - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - The Hudson QA environment helps you to test any supported stack against any supported target container. - To setup Hudson on your local box, you would run - - cd framework/trunk/hudson - ant hudson-setup - ant hudson-start - - When you hit http://localhost:8180/hudson you should be able to - - 1. login - 2. build a target container - 3. run a testsuite against the target container - - Publicly, Hudson is available at http://jbws.dyndns.org:8180/hudson/ - - Have fun + good luck - The JBossWS Team ---> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -96,6 +34,7 @@ <module>modules/management</module> <module>modules/server</module> <module>modules/client</module> + <module>modules/wsit</module> </modules> <!-- Properties --> 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 17:17:10 UTC (rev 6755) +++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 18:56:16 UTC (rev 6756) @@ -32,11 +32,11 @@ <include name="**/jaxws-tools.jar"/> <include name="**/jaxws-rt.jar"/> <include name="**/jaxws-api.jar"/> - <include name="**/jboss-wsit-rt.jar"/> - <include name="**/jboss-wsit-tools.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-metro-client.jar"/> + <include name="**/jbossws-metro-wsit-rt.jar"/> + <include name="**/jbossws-metro-wsit-tools.jar"/> <include name="**/jbossws-spi.jar"/> <include name="**/streambuffer.jar"/> <include name="**/stax-api.jar"/> @@ -81,9 +81,9 @@ <include name="**/jaxws-local-transport.jar"/> <include name="**/jaxws-rt.jar"/> <include name="**/jaxws-tools.jar"/> - <include name="**/jboss-wsit-rt.jar"/> - <include name="**/jboss-wsit-tools.jar"/> <include name="**/jbossws-metro-server.jar"/> + <include name="**/jbossws-metro-wsit-rt.jar"/> + <include name="**/jbossws-metro-wsit-tools.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/jsr173_api.jar"/> <include name="**/jsr250-api.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 17:17:10 UTC (rev 6755) +++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 18:56:16 UTC (rev 6756) @@ -85,7 +85,6 @@ <include>*:sjsxp:jar</include> <include>*:stax-api:jar</include> <include>*:stax-ex:jar</include> - <!--include>*:stax-utils:jar</include--> <include>*:streambuffer:jar</include> <include>*:txnannprocessor:jar</include> <include>*:wsdl4j:jar</include> @@ -115,6 +114,20 @@ <unpack>false</unpack> </binaries> </moduleSet> + <!-- + Does not work with maven-2.0.9 + This should include the output from module wsit + <moduleSet> + <includes> + <include>*:jbossws-metro-wsit:jar:*</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}-${module.classifier}.${module.extension}</outputFileNameMapping> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + </binaries> + </moduleSet--> </moduleSets> <!-- resources --> @@ -128,4 +141,17 @@ </fileSet> </fileSets> + <!-- This should be a moduleSet - see above --> + <files> + <file> + <outputDirectory>lib</outputDirectory> + <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source> + <destName>jbossws-metro-wsit-rt.jar</destName> + </file> + <file> + <outputDirectory>lib</outputDirectory> + <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source> + <destName>jbossws-metro-wsit-tools.jar</destName> + </file> + </files> </assembly> \ No newline at end of file