Author: thomas.diesler(a)jboss.com Date: 2008-05-30 09:00:32 -0400 (Fri, 30 May 2008) New Revision: 7233 Added: stack/native/trunk/modules/packeting/ Removed: stack/native/trunk/modules/deployment/ Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/packeting/pom.xml stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Add module packeting. Remove top level dependencies Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-05-30 12:08:02 UTC (rev 7232) +++ stack/native/trunk/modules/core/pom.xml 2008-05-30 13:00:32 UTC (rev 7233) @@ -72,8 +72,15 @@ <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> + <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <scope>provided</scope> + <version>1.0.0.SP2</version> + </dependency> + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <scope>provided</scope> Copied: stack/native/trunk/modules/packeting (from rev 7232, stack/native/trunk/modules/deployment) Modified: stack/native/trunk/modules/packeting/pom.xml =================================================================== --- stack/native/trunk/modules/deployment/pom.xml 2008-05-30 12:08:02 UTC (rev 7232) +++ stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:00:32 UTC (rev 7233) @@ -2,8 +2,8 @@ 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 Deployment</name> - <artifactId>jbossws-native-deployment</artifactId> + <name>JBoss Web Services - Stack Native Packeting</name> + <artifactId>jbossws-native-packeting</artifactId> <packaging>pom</packaging> <!-- Parent --> @@ -19,9 +19,48 @@ <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> Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-30 12:08:02 UTC (rev 7232) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-30 13:00:32 UTC (rev 7233) @@ -14,6 +14,16 @@ <relativePath>../pom.xml</relativePath> </parent> + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </dependency> + </dependencies> + <!-- Plugins --> <build> <plugins> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-30 12:08:02 UTC (rev 7232) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-30 13:00:32 UTC (rev 7233) @@ -35,6 +35,10 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-client</artifactId> <version>${version}</version> @@ -52,16 +56,6 @@ <systemPath>${java.home}/../lib/tools.jar</systemPath> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <type>zip</type> - </dependency> - <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> </dependency> @@ -412,6 +406,10 @@ </properties> <dependencies> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> <version>${hibernate.version}</version> @@ -421,10 +419,6 @@ <artifactId>jbossall-client</artifactId> <version>${jboss.version}</version> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - </dependency> </dependencies> <build> <plugins> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-30 12:08:02 UTC (rev 7232) +++ stack/native/trunk/pom.xml 2008-05-30 13:00:32 UTC (rev 7233) @@ -39,6 +39,7 @@ <module>modules/client</module> <module>modules/embedded</module> <module>modules/management</module> + <module>modules/packeting</module> </modules> <!-- Properties --> @@ -59,7 +60,6 @@ <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version> <jboss.jbosssx.version>2.0.2.Beta4</jboss.jbosssx.version> - <jboss.jbossxb.version>1.0.0.SP2</jboss.jbossxb.version> <jboss.logging.version>2.0.5.GA</jboss.logging.version> <jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version> <jboss.remoting.version>2.4.0.CR1</jboss.remoting.version> @@ -226,11 +226,6 @@ <version>${jboss.common.version}</version> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.jbossxb.version}</version> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> <version>${jboss.jbosssx.version}</version> @@ -358,114 +353,6 @@ </dependencies> </dependencyManagement> - <dependencies> - <!-- Provided dependencies, visible to all modules --> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Runtime dependencies, not visible at compile time --> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <scope>runtime</scope> - </dependency> - <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-jboss421</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> - <classifier>resources</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> - <dependency> - <groupId>jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <scope>runtime</scope> - <type>sar</type> - </dependency> - </dependencies> - <!-- Plugins --> <build> <plugins> @@ -537,34 +424,14 @@ <profiles> <!-- - Name: jdk16 - Descr: Compile with jdk1.6 - --> - <profile> - <id>jdk16</id> - <activation> - <jdk>1.6</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerVersion>1.5</compilerVersion> - <executable>${java.jdk15.home}/bin/javac</executable> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: bindist Descr: Build the binary distribution --> <profile> <id>bindist</id> + <modules> + <module>modules/deployment</module> + </modules> <build> <plugins> <plugin> @@ -643,6 +510,29 @@ </profile> <!-- + Name: jdk16 + Descr: Compile with jdk1.6 + --> + <profile> + <id>jdk16</id> + <activation> + <jdk>1.6</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerVersion>1.5</compilerVersion> + <executable>${java.jdk15.home}/bin/javac</executable> + <fork>true</fork> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: smoketest Descr: Executes the smoke tests --> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 12:08:02 UTC (rev 7232) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:00:32 UTC (rev 7233) @@ -7,49 +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-framework:jar</include> - <include>*:jbossws-jboss421: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> - <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> @@ -127,6 +84,47 @@ <unpack>false</unpack> </binaries> </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws.native:jbossws-native-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> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-jboss421: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> </moduleSets> <fileSets>