Author: jim.ma Date: 2011-01-24 04:52:32 -0500 (Mon, 24 Jan 2011) New Revision: 13597 Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/doc/ Removed: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/distro/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/doc/ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/scripts/ Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 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/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 stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml Log: Make all things work Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -14,19 +14,19 @@ <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <property name="stack.dir" value="${basedir}"/> - <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/> - <property name="stack.output.dir" value="${stack.dir}/target"/> + <property name="dist.dir" value="${stack.dir}/modules/dist"/> + <property name="dist.distro.dir" value="${dist.dir}/src/main/distro"/> + <property name="dist.output.dir" value="${dist.dir}/target"/> <property name="stack.modules.dir" value="${stack.dir}/modules"/> <property name="stack.management.dir" value="${stack.modules.dir}/management"/> <property name="stack.client.dir" value="${stack.modules.dir}/client"/> <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> - <property name="deploy.artifacts.dir" value="${stack.output.dir}/assembly/deploy-artifacts"/> + <property name="deploy.artifacts.dir" value="${dist.output.dir}/assembly/deploy-artifacts"/> - <import file="${stack.distro.dir}/build-setup.xml"/> - <import file="${stack.distro.dir}/build-deploy.xml"/> + <import file="${dist.distro.dir}/build-setup.xml"/> + <import file="${dist.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/> @@ -50,12 +50,12 @@ <target name="mvn-settings" depends="os-init"> <property name="maven.opts" value=""/> <!-- Loads the properties from the effective maven settings --> - <mkdir dir="${stack.output.dir}"/> + <mkdir dir="${dist.output.dir}"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/> + <arg value="-Doutput=${dist.output.dir}/effective-settings.xml"/> <arg line="${maven.opts} help:effective-settings"/> </exec> - <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> + <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> <isset property="profiles.profile.properties.jboss600.home"/> </condition> @@ -81,7 +81,7 @@ <echo message="integration.target=${jbossws.integration.target}"/> <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> - <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> + <property name="deploy.structure" value="${dist.output.dir}/deploy-${jbossws.integration.target}"/> </target> <!-- ================================================================== --> @@ -94,12 +94,12 @@ <property name="maven.opts" value=""/> <echo/> - <echo message="${mvn} ${maven.opts} package assembly:directory"/> + <echo message="${mvn} ${maven.opts} -Pdist install"/> <echo/> <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} package assembly:directory"/> + <arg line="${maven.opts} -Pdist install"/> </exec> </target> @@ -108,17 +108,17 @@ <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> <echo/> - <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/> + <echo message="${mvn} ${maven.opts} -Pdist -Dbindist install"/> <echo/> - <delete dir="${stack.output.dir}/jbossws-cxf-bin-dist"/> + <delete dir="${dist.output.dir}/jbossws-cxf-bin-dist"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Pbindist package assembly:directory"/> + <arg line="${maven.opts} -Pdist -Dbindist install"/> </exec> - <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip"> + <zip destfile="${dist.output.dir}/jbossws-cxf-bin-dist.zip"> <zipfileset - dir="${stack.output.dir}/assembly/jbossws-cxf-bin-dist" + dir="${dist.output.dir}/assembly/jbossws-cxf-bin-dist" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" prefix="jbossws-cxf-bin-dist"/> </zip> @@ -129,17 +129,17 @@ <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> <echo/> - <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/> + <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist install"/> <echo/> - <delete dir="${stack.output.dir}/jbossws-cxf-src-dist"/> + <delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Psrcdist package assembly:directory"/> + <arg line="${maven.opts} -Pdist -Dsrcdist install"/> </exec> - <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip"> + <zip destfile="${dist.output.dir}/jbossws-cxf-src-dist.zip"> <zipfileset - dir="${stack.output.dir}/assembly/jbossws-cxf-src-dist" + dir="${dist.output.dir}/assembly/jbossws-cxf-src-dist" includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project" prefix="jbossws-cxf-src-dist"/> </zip> Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -11,6 +11,7 @@ <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> + <!-- Build --> <dependencies> <!-- @@ -23,40 +24,8 @@ <scope>provided</scope> <type>zip</type> </dependency> - <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> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600x</artifactId> - <scope>provided</scope> - </dependency> - --> - <!-- END --> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <scope>provided</scope> - <type>sar</type> - </dependency> - </dependencies> +</dependencies> - <!-- Build --> <build> <plugins> <plugin> Modified: 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 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -21,25 +21,33 @@ </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-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-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> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-server</artifactId> + <version>${project.version}</version> + </dependency> + <!--test-suite--> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-shared-testsuite</artifactId> + <type>zip</type> + <scope>test</scope> + </dependency> + <!-- Spring --> <dependency> <groupId>org.springframework</groupId> @@ -73,9 +81,29 @@ <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> </dependency> + + <!--juddi--> + <dependency> + <groupId>org.jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <type>sar</type> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>apache-scout</groupId> + <artifactId>scout</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>juddi</groupId> + <artifactId>juddi</artifactId> + <scope>provided</scope> + </dependency> <!--jboss600--> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600</artifactId> <scope>provided</scope> @@ -91,30 +119,18 @@ </exclusions> </dependency> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <scope>provided</scope> - <type>sar</type> - </dependency--> - + <!--junit--> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </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> @@ -123,9 +139,9 @@ <goal>single</goal> </goals> <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> + <finalName>assembly</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> </descriptors> @@ -145,21 +161,15 @@ --> <profile> <id>bindist</id> + <activation> + <property> + <name>bindist</name> + </property> + </activation> <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> + <inherited>false</inherited> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> <executions> @@ -168,14 +178,14 @@ <goal>resources</goal> <goal>generate</goal> </goals> - <phase>package</phase> + <phase>prepare-package</phase> </execution> </executions> <configuration> <sourceDocumentName>JBossWS-CXF.xml</sourceDocumentName> - <sourceDirectory>src/main/doc</sourceDirectory> + <sourceDirectory>${basedir}/src/main/doc</sourceDirectory> <imageResource> - <directory>src/main/doc</directory> + <directory>${basedir}/src/main/doc</directory> <includes> <include>images/*</include> </includes> @@ -202,6 +212,23 @@ </options> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distribution-package</id> + <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> + </execution> + </executions> + </plugin> </plugins> </build> </profile> @@ -212,19 +239,30 @@ --> <profile> <id>srcdist</id> + <activation> + <property> + <name>srcdist</name> + </property> + </activation> + <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> + <executions> + <execution> + <id>distribution-package</id> + <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> + </execution> + </executions> </plugin> </plugins> </build> Copied: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro (from rev 13582, stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/distro) Property changes on: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro ___________________________________________________________________ Name: svn:mergeinfo + Copied: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/doc (from rev 13582, stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/doc) Property changes on: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/doc ___________________________________________________________________ Name: svn:mergeinfo + Modified: 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 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -36,7 +36,7 @@ </includes> </fileSet> <fileSet> - <directory>modules/resources/src/main/resources/resources</directory> + <directory>../resources/src/main/resources/resources</directory> <outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory> <includes> <include>deploy.conf</include> @@ -66,7 +66,7 @@ </fileSet> <!-- test etc --> <fileSet> - <directory>modules/testsuite/cxf-tests/src/test</directory> + <directory>../testsuite/cxf-tests/src/test</directory> <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> <includes> <include>etc/**</include> @@ -74,27 +74,20 @@ </fileSet> <!-- test excludes --> <fileSet> - <directory>modules/testsuite</directory> + <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> + + <dependencySets> + <dependencySet> <outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory> <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> <unpack>true</unpack> + <scope>test</scope> <includes> <include>*:jbossws-shared-testsuite:zip</include> </includes> @@ -117,10 +110,6 @@ <include>resources/saaj/**</include> </includes> </unpackOptions> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - </moduleSets> - + </dependencySet> + </dependencySets> </assembly> Modified: 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 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -4,61 +4,6 @@ <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> @@ -97,7 +42,6 @@ <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> @@ -126,9 +70,7 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - - <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> <includes> <include>org.springframework:spring-aop:jar</include> <include>org.springframework:spring-asm:jar</include> @@ -138,6 +80,10 @@ <include>org.springframework:spring-expression:jar</include> <include>org.springframework:spring-jms:jar</include> <include>org.springframework:spring-tx:jar</include> + <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> @@ -147,7 +93,6 @@ <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> @@ -156,7 +101,6 @@ <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> @@ -165,7 +109,6 @@ <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> @@ -174,12 +117,20 @@ <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> + <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> + </dependencySet> </dependencySets> </assembly> Modified: 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 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -9,15 +9,15 @@ <fileSets> <fileSet> - <directory>eclipse/</directory> + <directory>../../eclipse/</directory> <outputDirectory>jbossws-cxf-src-dist/eclipse/</outputDirectory> </fileSet> <fileSet> - <directory>src/</directory> + <directory>../../src/</directory> <outputDirectory>jbossws-cxf-src-dist/src/</outputDirectory> </fileSet> <fileSet> - <directory>modules/</directory> + <directory>../</directory> <outputDirectory>jbossws-cxf-src-dist/modules/</outputDirectory> <excludes> <exclude>**/target/**</exclude> @@ -25,7 +25,7 @@ </excludes> </fileSet> <fileSet> - <directory>modules/testsuite/shared-tests</directory> + <directory>../testsuite/shared-tests</directory> <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests</outputDirectory> <includes> <include>src/test/etc/</include> @@ -45,32 +45,21 @@ </includes> </fileSet> </fileSets> - - <!-- shared tests --> - <moduleSets> - <moduleSet> + + <dependencySets> + <dependencySet> + <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests/src/test</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <scope>test</scope> + <unpack>true</unpack> <includes> - <include>org.jboss.ws.cxf:jbossws-cxf-management</include> + <include>*:jbossws-shared-testsuite:zip</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> - + <unpackOptions> + <includes> + <include>**/*</include> + </includes> + </unpackOptions> + </dependencySet> + </dependencySets> </assembly> Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -57,7 +57,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> <!-- JAXR samples --> Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-01-21 09:25:26 UTC (rev 13596) +++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-01-24 09:52:32 UTC (rev 13597) @@ -39,7 +39,6 @@ <module>modules/server</module> <module>modules/client</module> <module>modules/endorsed</module> - <module>modules/management</module> <module>modules/resources</module> <module>modules/addons</module> </modules> @@ -56,7 +55,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <cxf.version>2.3.1</cxf.version> + <cxf.version>2.3.2</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>2.2.3</cxf.asm.version> <cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version> @@ -1146,6 +1145,14 @@ <artifactId>easymockclassextension</artifactId> <version>2.4</version> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -1210,7 +1217,6 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> <configuration> <finalName>assembly</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> @@ -1235,7 +1241,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> <configuration> <scmCommentPrefix>[${jira.issue}] :</scmCommentPrefix> <autoVersionSubmodules>true</autoVersionSubmodules> @@ -1246,96 +1251,13 @@ <!-- 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-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> + <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