[jbossws-commits] JBossWS SVN: r6620 - in stack/cxf/branches/tdiesler/trunk: scripts and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2008-04-22 12:36:15 -0400 (Tue, 22 Apr 2008) New Revision: 6620 Modified: stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml Log: assembly Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 15:29:05 UTC (rev 6619) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 16:36:15 UTC (rev 6620) @@ -16,6 +16,13 @@ <version>1.0-SNAPSHOT</version> </parent> + <!-- Modules --> + <modules> + <module>modules/management</module> + <module>modules/server</module> + <module>modules/client</module> + </modules> + <!-- Properties --> <properties> <cxf.version>2.0.5-incubator</cxf.version> @@ -33,14 +40,6 @@ <saaj.api.version>1.3</saaj.api.version> </properties> - <!-- Modules --> - <modules> - <module>modules/management</module> - <module>modules/server</module> - <module>modules/client</module> - <!--module>modules/testsuite</module--> - </modules> - <!-- DependencyManagement --> <dependencyManagement> <dependencies> @@ -209,6 +208,12 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> <dependency> Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 15:29:05 UTC (rev 6619) +++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-22 16:36:15 UTC (rev 6620) @@ -1,10 +1,44 @@ <assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>deploy-structure-jboss422</id> <formats> <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + + <!-- bin --> + <dependencySet> + <outputDirectory>bin</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:jbossws-framework:zip:scripts</include> + </includes> + </dependencySet> + + <!-- server/default/lib --> + <!-- + outputFileNameMapping in dependencySet uses pom's artifactid + http://jira.codehaus.org/browse/MASSEMBLY-315 + <dependencySet> + <outputDirectory>server/default/lib</outputDirectory> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:saaj-api:jar</include> + </includes> + </dependencySet> + --> + </dependencySets> + <moduleSets> <!-- client --> <moduleSet> @@ -23,55 +57,67 @@ <include>*:cxf-*</include> <include>*:geronimo-javamail*</include> <include>*:geronimo-ws-metadata*</include> - <include>*:jaxb-api*</include> - <include>*:jaxb-impl*</include> - <include>*:jaxb-xjc*</include> - <include>*:jaxws-api*</include> - <include>*:jbossws-common*</include> - <include>*:jbossws-framework*</include> - <include>*:jbossws-spi*</include> - <include>*:neethi*</include> - <include>*:saaj-api*</include> - <include>*:saaj-impl*</include> - <include>*:spring-beans*</include> - <include>*:spring-context*</include> - <include>*:spring-core*</include> - <include>*:stax-api*</include> - <include>*:wsdl4j*</include> - <include>*:xml-resolver*</include> - <include>*:XmlSchema*</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:neethi:jar</include> + <include>*:saaj-api:jar</include> + <include>*:saaj-impl:jar</include> + <include>*:spring-beans:jar</include> + <include>*:spring-context:jar</include> + <include>*:spring-core:jar</include> + <include>*:stax-api:jar</include> + <include>*:wsdl4j:jar</include> + <include>*:xml-resolver:jar</include> + <include>*:XmlSchema:jar</include> </includes> </dependencySet> <dependencySet> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:wstx*</include> + <include>*:wstx-asl:jar</include> </includes> </dependencySet> </dependencySets> </binaries> </moduleSet> - <!-- server/default/deploy/jbossws.sar --> + + <!-- server/default/lib --> <moduleSet> <includes> <include>org.jboss.ws:jbossws-cxf-client</include> </includes> <binaries> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <outputDirectory>server/default/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> <dependencySet> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> + <!-- + useProjectArtifact is documented but not in schema + http://jira.codehaus.org/browse/MASSEMBLY-316 + <useProjectArtifact>false</useProjectArtifact> + --> <includes> - <include>*:cxf-*</include> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:saaj-api:jar</include> </includes> </dependencySet> </dependencySets> </binaries> </moduleSet> + + <!-- server/default/deploy/jbossws.sar --> <moduleSet> <includes> <include>org.jboss.ws:jbossws-cxf-server</include> @@ -106,52 +152,33 @@ </moduleSet> <moduleSet> <includes> - <include>org.jboss.ws:jbossws-cxf-management</include> + <include>org.jboss.ws:jbossws-cxf-client</include> </includes> <binaries> - <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>true</unpack> - </binaries> - </moduleSet> - <!-- server/default/lib --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-server</include> - </includes> - <binaries> - <outputDirectory>server/default/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <unpack>false</unpack> <dependencySets> <dependencySet> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jaxws-api*</include> - <include>*:jbossws-common*</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi*</include> - <include>*:saaj-api*</include> + <include>*:cxf-*</include> </includes> </dependencySet> </dependencySets> </binaries> </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-management</include> + </includes> + <binaries> + <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>true</unpack> + </binaries> + </moduleSet> </moduleSets> - <dependencySets> - <dependencySet> - <outputDirectory>server/default/lib2</outputDirectory> - <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <unpack>false</unpack> - <includes> - <include>javax.xml.soap:saaj-api:jar</include> - <include>javax.xml.ws:jaxws-api:jar</include> - <include>org.jboss.ws:jbossws-common:jar</include> - <include>org.jboss.ws:jbossws-framework:jar</include> - <include>org.jboss.ws:jbossws-spi:jar</include> - </includes> - </dependencySet> - </dependencySets> + </assembly> \ No newline at end of file