Author: jim.ma Date: 2011-01-18 06:20:50 -0500 (Tue, 18 Jan 2011) New Revision: 13583 Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml Removed: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/management/ Log: Add dist module and move management module under dist Copied: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management (from rev 13582, stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/management) Property changes on: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management ___________________________________________________________________ Name: svn:ignore + target .classpath .project .settings Name: svn:mergeinfo + Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml 2011-01-18 11:20:50 UTC (rev 13583) @@ -0,0 +1,233 @@ +<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 CXF Distrubiton</name> + <artifactId>jbossws-cxf-dist</artifactId> + <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <properties> + </properties> + + <modules> + <module>management</module> + </modules> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-transports-httpserver</artifactId> + <version>${project.version}</version> + </dependency> + + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-server</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- Spring --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </dependency> + + <!--jboss600--> + <!--dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss600</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <scope>provided</scope> + <type>sar</type> + </dependency--> + + </dependencies> + + <build> + <resources> + <!--resource> + <directory>src/main/java</directory> + <includes> + <include>**/*</include> + </includes> + </resource--> + </resources> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>assembly</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <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-CXF.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-CXF_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> + </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> + </profiles> +</project> Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-18 11:20:50 UTC (rev 13583) @@ -0,0 +1,126 @@ +<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>binary-distribution</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <!-- root --> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>jbossws-cxf-bin-dist</outputDirectory> + <includes> + <include>build.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>jbossws-cxf-bin-dist</outputDirectory> + <filtered>true</filtered> + <includes> + <include>ant.properties.example</include> + </includes> + </fileSet> + <!-- build --> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> + <includes> + <include>build-deploy.xml</include> + <include>build-setup.xml</include> + <include>build-project-gen.xml</include> + <include>user-project-build.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/resources/src/main/resources/resources</directory> + <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> + <includes> + <include>deploy.conf</include> + <include>server-deploy.conf</include> + <include>jbossws-deploy-macros.xml</include> + </includes> + </fileSet> + <!-- docs --> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>jbossws-cxf-bin-dist/docs</outputDirectory> + <filtered>true</filtered> + <includes> + <include>Install.txt</include> + <include>ReleaseNotes.txt</include> + <include>JBossORG-EULA.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>target/docbook/publish</directory> + <outputDirectory>jbossws-cxf-bin-dist/docs</outputDirectory> + </fileSet> + <!-- deploy --> + <fileSet> + <directory>target/assembly/deploy-artifacts</directory> + <outputDirectory>jbossws-cxf-bin-dist/deploy</outputDirectory> + </fileSet> + <!-- test etc --> + <fileSet> + <directory>modules/testsuite/cxf-tests/src/test</directory> + <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> + <includes> + <include>etc/**</include> + </includes> + </fileSet> + <!-- test excludes --> + <fileSet> + <directory>modules/testsuite</directory> + <outputDirectory>jbossws-cxf-bin-dist/tests/resources</outputDirectory> + <includes> + <include>test-excludes-*.txt</include> + </includes> + </fileSet> + </fileSets> + + <!-- shared tests --> + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws.cxf:jbossws-cxf-management</include> + </includes> + <binaries> + <dependencySets> + <dependencySet> + <outputDirectory>jbossws-cxf-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> + +</assembly> Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-18 11:20:50 UTC (rev 13583) @@ -0,0 +1,185 @@ +<assembly> + <id></id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + </formats> + +<moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws.cxf:jbossws-cxf-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>../resources/src/main/resources/bin</directory> + <outputDirectory>deploy-artifacts/bin</outputDirectory> + <includes> + <include>wsconsume.*</include> + <include>wsprovide.*</include> + <include>wsrunclient.*</include> + </includes> + </fileSet> + + <!-- resources --> + <fileSet> + <directory>../server/target/resources</directory> + <outputDirectory>deploy-artifacts/resources</outputDirectory> + <includes> + <include>jbossws-*/**</include> + </includes> + </fileSet> + + <!-- management console and port component link servlet --> + <fileSet> + <directory>./management/target</directory> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <includes> + <include>jbossws-cxf-management.war</include> + <include>jbossws-cxf-management-pcl.war</include> + </includes> + </fileSet> + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws.cxf:*</include> + <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> + <include>org.jboss.ws.projects:jaxws-httpserver-httpspi:jar</include> + <include>org.apache.cxf:cxf-*</include> + <include>org.apache.cxf.xjcplugins:cxf-*</include> + <include>com.sun.xml.bind:jaxb-impl:jar</include> + <include>com.sun.xml.bind:jaxb-xjc: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.apache.neethi:neethi:jar</include> + <include>wsdl4j:wsdl4j:jar</include> + <include>org.apache.ws.commons.schema:XmlSchema:jar</include> + <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> + <include>org.apache.ws.security:wss4j:jar</include> + <include>org.apache.santuario:xmlsec:jar</include> + <include>asm:asm:jar</include> + <include>apache-velocity:velocity:jar</include> + <include>commons-collections:commons-collections:jar</include> + <include>commons-beanutils:commons-beanutils:jar</include> + <include>commons-lang:commons-lang:jar</include> + <include>jboss.jaxbintros:jboss-jaxb-intros</include> + <include>stax:stax-api:jar</include> + <include>javax.jws:jsr181-api:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.springframework:spring-aop:jar</include> + <include>org.springframework:spring-asm:jar</include> + <include>org.springframework:spring-beans:jar</include> + <include>org.springframework:spring-context:jar</include> + <include>org.springframework:spring-core:jar</include> + <include>org.springframework:spring-expression:jar</include> + <include>org.springframework:spring-jms:jar</include> + <include>org.springframework:spring-tx:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.codehaus.woodstox:wstx-lgpl:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <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> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <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> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <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> + + </dependencySets> + +</assembly> Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-18 11:20:50 UTC (rev 13583) @@ -0,0 +1,76 @@ +<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-cxf-src-dist/eclipse/</outputDirectory> + </fileSet> + <fileSet> + <directory>src/</directory> + <outputDirectory>jbossws-cxf-src-dist/src/</outputDirectory> + </fileSet> + <fileSet> + <directory>modules/</directory> + <outputDirectory>jbossws-cxf-src-dist/modules/</outputDirectory> + <excludes> + <exclude>**/target/**</exclude> + <exclude>**/shared-tests/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>modules/testsuite/shared-tests</directory> + <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests</outputDirectory> + <includes> + <include>src/test/etc/</include> + <include>scripts/</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory></directory> + <outputDirectory>jbossws-cxf-src-dist/</outputDirectory> + <includes> + <include>.classpath</include> + <include>.project</include> + <include>build.xml</include> + <include>pom.xml</include> + <include>profiles.xml.example</include> + </includes> + </fileSet> + </fileSets> + + <!-- shared tests --> + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws.cxf:jbossws-cxf-management</include> + </includes> + <binaries> + <dependencySets> + <dependencySet> + <outputDirectory>jbossws-cxf-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> + +</assembly>