Author: jim.ma
Date: 2011-02-15 02:31:20 -0500 (Tue, 15 Feb 2011)
New Revision: 13742
Removed:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/management/
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml
Log:
Remove moduleSet configuraiton in assembly scripts
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml
===================================================================
---
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-02-14
14:31:15 UTC (rev 13741)
+++
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-02-15
07:31:20 UTC (rev 13742)
@@ -82,6 +82,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <warName>jbossws-native-management</warName>
<webResources>
<resource>
<directory>src/main/webapp</directory>
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
---
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-14
14:31:15 UTC (rev 13741)
+++
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-15
07:31:20 UTC (rev 13742)
@@ -83,44 +83,35 @@
</fileSets>
<!-- shared tests -->
- <moduleSets>
- <moduleSet>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <scope>test</scope>
<includes>
- <include>org.jboss.ws.native:jbossws-native-management</include>
- </includes>
- <binaries>
- <dependencySets>
- <dependencySet>
- <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-shared-testsuite:zip</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>ant-import/**</include>
- <include>java/org/jboss/test/ws/console/**</include>
- <include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
- <include>java/org/jboss/test/ws/jaxws/samples/**</include>
- <include>java/org/jboss/test/ws/jaxws/smoke/**</include>
- <include>java/org/jboss/test/ws/management/**</include>
-
<include>java/org/jboss/test/ws/projectGenerator/**</include>
- <include>java/org/jboss/test/ws/saaj/**</include>
- <include>resources/console/**</include>
- <include>resources/jaxrpc/samples/**</include>
- <include>resources/jaxws/samples/**</include>
- <include>resources/jaxws/smoke/**</include>
- <include>resources/management/**</include>
- <include>resources/projectGenerator/**</include>
- <include>resources/saaj/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
+ <include>*:jbossws-shared-testsuite:zip</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/org/jboss/test/ws/console/**</include>
+ <include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
+ <include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>java/org/jboss/test/ws/jaxws/smoke/**</include>
+ <include>java/org/jboss/test/ws/management/**</include>
+ <include>java/org/jboss/test/ws/projectGenerator/**</include>
+ <include>java/org/jboss/test/ws/saaj/**</include>
+ <include>resources/console/**</include>
+ <include>resources/jaxrpc/samples/**</include>
+ <include>resources/jaxws/samples/**</include>
+ <include>resources/jaxws/smoke/**</include>
+ <include>resources/management/**</include>
+ <include>resources/projectGenerator/**</include>
+ <include>resources/saaj/**</include>
+ </includes>
+ </unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-02-14
14:31:15 UTC (rev 13741)
+++
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-02-15
07:31:20 UTC (rev 13742)
@@ -6,169 +6,14 @@
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
-
- <!-- lib -->
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-client</include>
- </includes>
- <binaries>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
-
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
-
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
-
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
-
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-core</include>
- </includes>
- <binaries>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
-
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
-
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
- <include>javax.jws:jsr181-api:jar</include>
- <include>com.sun.xml.bind:jaxb-impl:jar</include>
- <include>com.sun.xml.bind:jaxb-xjc:jar</include>
- <include>com.sun.xml.ws:jaxws-tools:jar</include>
- <include>com.sun.xml.ws:jaxws-rt:jar</include>
- <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
- <include>junit:junit:jar</include>
- <include>org.jboss.ws:jbossws-api:jar</include>
- <include>org.jboss.ws:jbossws-common:jar</include>
- <include>org.jboss.ws:jbossws-spi:jar</include>
- <include>org.codehaus.jettison:jettison:jar</include>
- <include>com.sun.xml.ws:policy:jar</include>
- <include>stax:stax-api:jar</include>
- <include>org.jvnet.staxex:stax-ex:jar</include>
- <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
- <include>wsdl4j:wsdl4j:jar</include>
- <include>org.apache:xmlsec:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>commons-beanutils:commons-beanutils:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
-
<include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
-
<include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
-
<include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>saaj-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
-
<include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
-
<outputFileNameMapping>wscommons-policy.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>ws-commons:policy:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-management</include>
- </includes>
- <binaries>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
-
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
-
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.jaxr:juddi-service:sar</include>
- <include>apache-scout:scout:jar</include>
- <include>juddi:juddi:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
-
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss600:jar</include>
- </includes>
- </dependencySet>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
-
<outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss600x:jar</include>
- </includes>
- </dependencySet>
- -->
- <!-- END -->
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
<fileSets>
<!-- bin -->
<fileSet>
- <directory>modules/resources/src/main/resources/bin</directory>
+ <directory>../resources/src/main/resources/bin</directory>
<outputDirectory>deploy-artifacts/bin</outputDirectory>
<includes>
<include>wsconsume.*</include>
- <include>wsprovide.*</include>
+ <include>wsprovide.*</include>
<include>wsrunclient.*</include>
<include>wstools.*</include>
</includes>
@@ -176,12 +21,158 @@
<!-- resources -->
<fileSet>
- <directory>modules/core/target/resources</directory>
+ <directory>../core/target/resources</directory>
<outputDirectory>deploy-artifacts/resources</outputDirectory>
<includes>
<include>jbossws-*/**</include>
</includes>
</fileSet>
+
+ <!-- management -->
+ <fileSet>
+ <directory>./management/target</directory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <includes>
+ <include>jbossws-native-management.war</include>
+ </includes>
+ </fileSet>
+
</fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws.native:jbossws-native-client</include>
+ <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-services:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-core</include>
+ <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
+ <include>javax.jws:jsr181-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ <include>com.sun.xml.ws:jaxws-tools:jar</include>
+ <include>com.sun.xml.ws:jaxws-rt:jar</include>
+ <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
+ <include>org.jboss.ws:jbossws-api:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ <include>org.codehaus.jettison:jettison:jar</include>
+ <include>com.sun.xml.ws:policy:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>org.jvnet.staxex:stax-ex:jar</include>
+ <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>org.apache:xmlsec:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>commons-beanutils:commons-beanutils:jar</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.jaxr:juddi-service:sar</include>
+ <include>apache-scout:scout:jar</include>
+ <include>juddi:juddi:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <scope>provided</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <includes>
+ <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
+ <includes>
+
<include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
+ <includes>
+
<include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
+ <includes>
+
<include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>saaj-api.jar</outputFileNameMapping>
+ <includes>
+
<include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>wscommons-policy.jar</outputFileNameMapping>
+ <includes>
+ <include>ws-commons:policy:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>junit:junit:jar</include>
+ </includes>
+ <scope>test</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+
<outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope> <unpack>false</unpack>
<includes>
+ <include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
+ </dependencySet>
+ -->
+ <!-- END -->
+ </dependencySets>
+
+
+
</assembly>
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
===================================================================
---
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-14
14:31:15 UTC (rev 13741)
+++
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-15
07:31:20 UTC (rev 13742)
@@ -1,16 +1,17 @@
<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>source-distribution</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
-
+
<fileSets>
<fileSet>
<directory>eclipse/</directory>
- <outputDirectory>jbossws-native-src-dist/eclipse/</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/eclipse/
+ </outputDirectory>
</fileSet>
<fileSet>
<directory>src/</directory>
@@ -18,7 +19,8 @@
</fileSet>
<fileSet>
<directory>modules/</directory>
- <outputDirectory>jbossws-native-src-dist/modules/</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/modules/
+ </outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/shared-tests/**</exclude>
@@ -26,7 +28,8 @@
</fileSet>
<fileSet>
<directory>modules/testsuite/shared-tests</directory>
-
<outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests
+ </outputDirectory>
<includes>
<include>src/test/etc/</include>
<include>scripts/</include>
@@ -41,36 +44,27 @@
<include>.project</include>
<include>build.xml</include>
<include>pom.xml</include>
- <include>profiles.xml.example</include>
</includes>
</fileSet>
</fileSets>
-
+
<!-- shared tests -->
- <moduleSets>
- <moduleSet>
+ <dependencySets>
+ <dependencySet>
+
<outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests/src/test
+ </outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>true</unpack>
<includes>
- <include>org.jboss.ws.native:jbossws-native-management</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
- <binaries>
- <dependencySets>
- <dependencySet>
-
<outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests/src/test</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-shared-testsuite:zip</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>**/*</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
+ <unpackOptions>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-02-14 14:31:15
UTC (rev 13741)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-02-15 07:31:20
UTC (rev 13742)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.9.GA</version>
+ <version>1.0.10-SNAPSHOT</version>
</parent>
<!-- Source Control Management -->
@@ -39,7 +39,6 @@
<module>modules/endorsed</module>
<module>modules/core</module>
<module>modules/client</module>
- <module>modules/management</module>
<module>modules/resources</module>
<module>modules/services</module>
</modules>
@@ -78,6 +77,7 @@
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.4.3</xmlsec.version>
<xerces.version>2.9.1</xerces.version>
+ <junit.version>3.8.1</junit.version>
</properties>
<!-- DependencyManagement -->
@@ -351,7 +351,15 @@
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
</dependencyManagement>
<!-- Plugins -->
@@ -448,98 +456,14 @@
<!-- Profiles -->
<profiles>
- <!--
- Name: bindist
- Descr: Build the binary distribution
- -->
<profile>
- <id>bindist</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
-
<descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
-
<descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <sourceDocumentName>JBossWS-Native.xml</sourceDocumentName>
- <sourceDirectory>src/main/doc</sourceDirectory>
- <imageResource>
- <directory>src/main/doc</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <formats>
- <!--format>
- <formatName>pdf</formatName>
-
<stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>JBossWS-Native_Guide.pdf</finalName>
- </format-->
- <format>
- <formatName>html</formatName>
-
<stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
-
<stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <id>dist</id>
+ <modules>
+ <module>modules/dist</module>
+ </modules>
</profile>
<!--
- Name: srcdist
- Descr: Build the source distribution
- -->
- <profile>
- <id>srcdist</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
-
<descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
-
<descriptor>src/main/scripts/assembly-src-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss600
Descr: JBoss-6.0.0 specific options
-->