[jbossws-commits] JBossWS SVN: r6629 - in stack/cxf/branches/tdiesler/trunk: modules/client and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 06:52:34 -0400 (Wed, 23 Apr 2008) New Revision: 6629 Modified: stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/profiles-example.xml stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml Log: deploy structure ok Modified: stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-23 10:09:32 UTC (rev 6628) +++ stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-23 10:52:34 UTC (rev 6629) @@ -63,12 +63,39 @@ <artifactId>stax-api</artifactId> </dependency> + <!-- + useStrictFiltering requires dependency in all included modules + http://jira.codehaus.org/browse/MASSEMBLY-317 + --> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + </dependency> + <!-- jboss provided --> <dependency> <groupId>jboss.common</groupId> <artifactId>jboss-common</artifactId> </dependency> - </dependencies> + <!-- Profiles --> + <profiles> + <profile> + <id>jboss422-client-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Modified: stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-23 10:09:32 UTC (rev 6628) +++ stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-23 10:52:34 UTC (rev 6629) @@ -12,4 +12,14 @@ <version>3.0.2-SNAPSHOT</version> </parent> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 10:09:32 UTC (rev 6628) +++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 10:52:34 UTC (rev 6629) @@ -38,11 +38,6 @@ <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss42</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -160,4 +155,23 @@ </plugins> </build> + <!-- Profiles --> + <profiles> + <profile> + <id>jboss422-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 10:09:32 UTC (rev 6628) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 10:52:34 UTC (rev 6629) @@ -200,30 +200,10 @@ <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> - </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> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </dependency> </dependencies> <!-- Plugins --> Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 10:09:32 UTC (rev 6628) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 10:52:34 UTC (rev 6629) @@ -1,8 +1,8 @@ <profilesXml 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/profiles-1.0.0.xsd"> - - <!-- This profile can also be defined in ~/.m2/settings.xml --> <profiles> + + <!-- Defines the required integration properties --> <profile> <id>user-profile-cxf</id> <activation> @@ -10,6 +10,16 @@ </activation> <properties> <jbossws.integration.target>jboss422</jbossws.integration.target> + </properties> + </profile> + + <!-- This profile can also be defined in ~/.m2/settings.xml --> + <profile> + <id>user-profile-jboss</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home> <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home> @@ -17,6 +27,6 @@ <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> </properties> </profile> + </profiles> - </profilesXml> \ No newline at end of file Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 10:09:32 UTC (rev 6628) +++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 10:52:34 UTC (rev 6629) @@ -64,6 +64,7 @@ <include>*:jbossws-common:jar</include> <include>*:jbossws-framework:jar</include> <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> <include>*:neethi:jar</include> <include>*:saaj-api:jar</include> <include>*:saaj-impl:jar</include> @@ -90,7 +91,7 @@ <!-- server/default/lib --> <moduleSet> <includes> - <include>org.jboss.ws:jbossws-cxf-client</include> + <include>org.jboss.ws:jbossws-cxf-server</include> </includes> <binaries> <outputDirectory>server/default/lib</outputDirectory> @@ -110,6 +111,7 @@ <include>*:jbossws-common:jar</include> <include>*:jbossws-framework:jar</include> <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> <include>*:saaj-api:jar</include> </includes> </dependencySet> @@ -121,6 +123,7 @@ <moduleSet> <includes> <include>org.jboss.ws:jbossws-cxf-server</include> + <include>org.jboss.ws:jbossws-cxf-client</include> </includes> <binaries> <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> @@ -150,35 +153,43 @@ </dependencySets> </binaries> </moduleSet> + <!-- server/default/deploy/jbossws.sar/jbossws-context.war --> <moduleSet> <includes> - <include>org.jboss.ws:jbossws-cxf-client</include> - </includes> - <binaries> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <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> + <includeDependencies>false</includeDependencies> <unpack>true</unpack> </binaries> </moduleSet> </moduleSets> + <fileSets> + <!-- server/default/deploy/jbossws.sar/META-INF --> + <fileSet> + <directory>modules/server/target/resources/jbossws-cxf.sar</directory> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <includes> + <include>META-INF/**</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/server/target/resources/jbossws-jboss42.sar</directory> + <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> + <includes> + <include>META-INF/**</include> + </includes> + </fileSet> + <!-- server/default/deploy/jbossws.sar/jbossws.beans --> + <fileSet> + <directory>modules/server/target/resources/</directory> + <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans/META-INF</outputDirectory> + <includes> + <include>jbossws-cxf42-beans.xml</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file