[jbossws-commits] JBossWS SVN: r7236 - in stack/metro/trunk: modules and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-05-30 09:30:30 -0400 (Fri, 30 May 2008) New Revision: 7236 Added: stack/metro/trunk/modules/packeting/ stack/metro/trunk/modules/packeting/pom.xml Removed: stack/metro/trunk/modules/packeting/pom.xml Modified: stack/metro/trunk/pom.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Add module packeting. Remove top level dependencies. Copied: stack/metro/trunk/modules/packeting (from rev 7235, stack/native/trunk/modules/packeting) Deleted: stack/metro/trunk/modules/packeting/pom.xml =================================================================== --- stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:16:26 UTC (rev 7235) +++ stack/metro/trunk/modules/packeting/pom.xml 2008-05-30 13:30:30 UTC (rev 7236) @@ -1,66 +0,0 @@ -<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> - - <name>JBoss Web Services - Stack Native Packeting</name> - <artifactId>jbossws-native-packeting</artifactId> - <packaging>jar</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native</artifactId> - <version>3.0.2-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <!-- Dependencies --> - <dependencies> - <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-jboss421</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <classifier>container</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <classifier>container</classifier> - </dependency> - <dependency> - <groupId>jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - </dependency> - </dependencies> - -</project> Copied: stack/metro/trunk/modules/packeting/pom.xml (from rev 7234, stack/native/trunk/modules/packeting/pom.xml) =================================================================== --- stack/metro/trunk/modules/packeting/pom.xml (rev 0) +++ stack/metro/trunk/modules/packeting/pom.xml 2008-05-30 13:30:30 UTC (rev 7236) @@ -0,0 +1,62 @@ +<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> + + <name>JBoss Web Services - Stack Metro Packeting</name> + <artifactId>jbossws-metro-packeting</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws.metro</groupId> + <artifactId>jbossws-metro</artifactId> + <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <!-- Dependencies --> + <dependencies> + <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-jboss422</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <classifier>container</classifier> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <classifier>container</classifier> + </dependency> + <dependency> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <type>sar</type> + </dependency> + </dependencies> + +</project> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-05-30 13:16:26 UTC (rev 7235) +++ stack/metro/trunk/pom.xml 2008-05-30 13:30:30 UTC (rev 7236) @@ -35,6 +35,7 @@ <module>modules/server</module> <module>modules/client</module> <module>modules/wsit</module> + <module>modules/packeting</module> </modules> <!-- Properties --> @@ -272,84 +273,6 @@ </dependencies> </dependencyManagement> - <!-- Runtime dependencies, not visible at compile time --> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>scripts</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <classifier>resources</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <classifier>resources</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <classifier>container</classifier> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <classifier>resources</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <classifier>container</classifier> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <classifier>resources</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - </dependencies> - <!-- Plugins --> <build> <plugins> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:16:26 UTC (rev 7235) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:30:30 UTC (rev 7236) @@ -7,47 +7,6 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - - <!-- bin --> - <dependencySet> - <outputDirectory>bin</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>true</unpack> - <includes> - <include>*:jbossws-framework:zip:scripts</include> - </includes> - </dependencySet> - - <!-- lib --> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-jboss422:jar:*</include> - <include>*:jbossws-jboss423:jar:*</include> - <include>*:jbossws-jboss500:jar:*</include> - <include>*:jbossws-jboss501:jar:*</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-jboss500:jar:container</include> - <include>*:jbossws-jboss501:jar:container</include> - </includes> - </dependencySet> - </dependencySets> - - <!-- lib --> <moduleSets> <moduleSet> <includes> @@ -114,6 +73,47 @@ <unpack>false</unpack> </binaries> </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws.metro:jbossws-metro-packeting</include> + </includes> + <binaries> + <dependencySets> + <dependencySet> + <outputDirectory>bin</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:jbossws-framework:zip:scripts</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-jboss422:jar</include> + <include>*:jbossws-jboss423:jar</include> + <include>*:jbossws-jboss500:jar</include> + <include>*:jbossws-jboss501:jar</include> + <include>*:juddi-service:sar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500:jar:container</include> + <include>*:jbossws-jboss501:jar:container</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> <!-- Does not work with maven-2.0.9 This should include the output from module wsit