Author: jim.ma Date: 2011-02-15 21:11:40 -0500 (Tue, 15 Feb 2011) New Revision: 13747 Removed: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.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-src-dist.xml stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml Log: Remove profiles.xml and update the related assembly script and pom.xml Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml 2011-02-15 15:20:54 UTC (rev 13746) +++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml 2011-02-16 02:11:40 UTC (rev 13747) @@ -16,13 +16,16 @@ <!-- ================================================================== --> <property name="stack.dir" value="${basedir}"/> + <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.distro.dir" value="${stack.dir}/src/main/distro"/> <property name="stack.output.dir" value="${stack.dir}/target"/> <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"/> @@ -45,18 +48,12 @@ <target name="mvn-settings" depends="os-init"> <!-- 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 value="help:effective-settings"/> </exec> - <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> - <isset property="profiles.profile.properties.jboss501.home"/> - </condition> - <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> - <isset property="profiles.profile.properties.jboss510.home"/> - </condition> + <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> @@ -64,16 +61,20 @@ <isset property="profiles.profile.properties.jboss601.home"/> </condition> - <!-- Loads the properties from the user profile --> - <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/> - <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> - <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> - <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/> + <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value to set"> + <condition> + <and> + <not> + <isset property="jboss600.home"/> + </not> + <not> + <isset property="jboss601.home"/> + </not> + </and> + </condition> + </fail> <echo/> - <echo message="jboss501.home=${jboss501.home}"/> - <echo message="jboss510.home=${jboss510.home}"/> <echo message="jboss600.home=${jboss600.home}"/> <echo message="jboss601.home=${jboss601.home}"/> </target> @@ -88,7 +89,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> <!-- ================================================================== --> @@ -101,55 +102,64 @@ <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> - <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution"> + <target name="build-bin-dist" depends="prepare,os-init,makedir" description="Build the binary distribution"> <!-- 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-native-bin-dist"/> + <delete dir="${dist.output.dir}/jbossws-native-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-native-bin-dist.zip"> <zipfileset - dir="${stack.output.dir}/assembly/jbossws-native-bin-dist" + dir="${dist.output.dir}/assembly/jbossws-native-bin-dist" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" prefix="jbossws-native-bin-dist"/> </zip> </target> - <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution"> + <target name="build-src-dist" depends="prepare,os-init,makedir" description="Build the source distribution"> <!-- 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-native-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-native-src-dist.zip"> <zipfileset - dir="${stack.output.dir}/assembly/jbossws-native-src-dist" + dir="${dist.output.dir}/assembly/jbossws-native-src-dist" includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project " prefix="jbossws-native-src-dist"/> </zip> </target> + <target name="check.exist"> + <available file="${stack.output.dir}" property="file.exists" value="true" /> + </target> + + <target name="makedir" depends="check.exist" unless="file.exists"> + <mkdir dir="${stack.output.dir}" /> + </target> + + </project> 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-15 15:20:54 UTC (rev 13746) +++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-16 02:11:40 UTC (rev 13747) @@ -36,7 +36,7 @@ </includes> </fileSet> <fileSet> - <directory>modules/resources/src/main/resources/resources</directory> + <directory>../resources/src/main/resources/resources</directory> <outputDirectory>jbossws-native-bin-dist/build</outputDirectory> <includes> <include>deploy.conf</include> @@ -66,7 +66,7 @@ </fileSet> <!-- test etc --> <fileSet> - <directory>modules/testsuite/native-tests/src/test</directory> + <directory>../testsuite/native-tests/src/test</directory> <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory> <includes> <include>etc/**</include> @@ -74,7 +74,7 @@ </fileSet> <!-- test excludes --> <fileSet> - <directory>modules/testsuite</directory> + <directory>target/exclude-file</directory> <outputDirectory>jbossws-native-bin-dist/tests/resources</outputDirectory> <includes> <include>test-excludes-*.txt</include> 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-15 15:20:54 UTC (rev 13746) +++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-16 02:11:40 UTC (rev 13747) @@ -9,25 +9,24 @@ <fileSets> <fileSet> - <directory>eclipse/</directory> + <directory>../../eclipse/</directory> <outputDirectory>jbossws-native-src-dist/eclipse/ </outputDirectory> </fileSet> <fileSet> - <directory>src/</directory> + <directory>../../src/</directory> <outputDirectory>jbossws-native-src-dist/src/</outputDirectory> </fileSet> <fileSet> - <directory>modules/</directory> - <outputDirectory>jbossws-native-src-dist/modules/ - </outputDirectory> + <directory>../</directory> + <outputDirectory>jbossws-native-src-dist/modules/</outputDirectory> <excludes> <exclude>**/target/**</exclude> <exclude>**/shared-tests/**</exclude> </excludes> </fileSet> <fileSet> - <directory>modules/testsuite/shared-tests</directory> + <directory>../testsuite/shared-tests</directory> <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests </outputDirectory> <includes> @@ -37,7 +36,7 @@ </includes> </fileSet> <fileSet> - <directory></directory> + <directory>./../</directory> <outputDirectory>jbossws-native-src-dist/</outputDirectory> <includes> <include>.classpath</include> Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-02-15 15:20:54 UTC (rev 13746) +++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-02-16 02:11:40 UTC (rev 13747) @@ -421,8 +421,6 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile> <compilerArgument>-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</compilerArgument> </configuration> </plugin> @@ -430,6 +428,19 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine> + <excludes> + <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration--> + <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> + + <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored--> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + + <!-- # [JBAS-8363] Virtual host issue in JBossWeb --> + <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> + + <!-- # [JBWS-3150] This test causes hudson to freeze --> + <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -521,8 +532,6 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile> <compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument> </configuration> </plugin> @@ -530,6 +539,19 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine> + <excludes> + <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration--> + <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> + + <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored--> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + + <!-- # [JBAS-8363] Virtual host issue in JBossWeb --> + <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> + + <!-- # [JBWS-3150] This test causes hudson to freeze --> + <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> + </excludes> </configuration> </plugin> </plugins> Deleted: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example =================================================================== --- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example 2011-02-15 15:20:54 UTC (rev 13746) +++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example 2011-02-16 02:11:40 UTC (rev 13747) @@ -1,20 +0,0 @@ -<profilesXml 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/profiles-1.0.0.xsd"> - <profiles> - - <!-- This profile can also be defined in ~/.m2/settings.xml --> - <profile> - <id>jboss-home-profile</id> - <activation> - <property> - <name>user.name</name> - </property> - </activation> - <properties> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final</jboss600.home> - <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home> - </properties> - </profile> - - </profiles> -</profilesXml>