[jbossws-commits] JBossWS SVN: r6859 - in stack/metro/trunk: src/main/distro and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2008-05-02 10:50:45 -0400 (Fri, 02 May 2008) New Revision: 6859 Removed: stack/metro/trunk/ant.properties.example Modified: stack/metro/trunk/build.xml stack/metro/trunk/src/main/distro/build-setup.xml stack/metro/trunk/src/main/distro/build.xml Log: Load the jboss.home properties from the effective maven settings Deleted: stack/metro/trunk/ant.properties.example =================================================================== --- stack/metro/trunk/ant.properties.example 2008-05-02 14:32:07 UTC (rev 6858) +++ stack/metro/trunk/ant.properties.example 2008-05-02 14:50:45 UTC (rev 6859) @@ -1,17 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# Optional JBoss Home -#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA -#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA -#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4 -#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1 - -# The JBoss settings -jboss.server.instance=default - -# JBossWS Release -jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content -jboss.local.repository=/home/tdiesler/svn/jboss.local.repository \ No newline at end of file Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-05-02 14:32:07 UTC (rev 6858) +++ stack/metro/trunk/build.xml 2008-05-02 14:50:45 UTC (rev 6859) @@ -38,7 +38,38 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="init" depends="prepare"> + <!-- + Loads the jboss.home properties from the effective maven settings + --> + <target name="mvn-settings"> + <mkdir dir="${stack.output.dir}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true" output="${stack.output.dir}/effective-settings.txt"> + <arg value="help:effective-settings"/> + </exec> + <loadfile srcfile="${stack.output.dir}/effective-settings.txt" property="mvn.effective.settings"> + <filterchain> + <tokenfilter> + <replaceregex pattern="\[INFO\](.*)" replace=""/> + <replaceregex pattern="Effective settings:" replace=""/> + <replaceregex pattern=".\?xml(.*)\?\>" replace=""/> + </tokenfilter> + </filterchain> + </loadfile> + <echo message="${mvn.effective.settings}" file="${stack.output.dir}/effective-settings.xml"/> + <xmlproperty file="${stack.output.dir}/effective-settings.xml"/> + <property name="jboss421.home" value="${settings.profiles.profile.properties.jboss421.home}"/> + <property name="jboss422.home" value="${settings.profiles.profile.properties.jboss422.home}"/> + <property name="jboss423.home" value="${settings.profiles.profile.properties.jboss423.home}"/> + <property name="jboss500.home" value="${settings.profiles.profile.properties.jboss500.home}"/> + <property name="jboss501.home" value="${settings.profiles.profile.properties.jboss501.home}"/> + <echo message="jboss421.home=${jboss421.home}"/> + <echo message="jboss422.home=${jboss422.home}"/> + <echo message="jboss423.home=${jboss423.home}"/> + <echo message="jboss500.home=${jboss500.home}"/> + <echo message="jboss501.home=${jboss501.home}"/> + </target> + + <target name="init" depends="mvn-settings,prepare"> <xmlproperty file="${stack.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> @@ -76,19 +107,4 @@ </exec> </target> - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - - <echo message="*************************************"/> - <echo message="* mvn clean *"/> - <echo message="*************************************"/> - - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="clean"/> - </exec> - </target> - </project> Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2008-05-02 14:32:07 UTC (rev 6858) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-05-02 14:50:45 UTC (rev 6859) @@ -17,56 +17,48 @@ <!-- Setup --> <!-- ================================================================== --> - <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - <target name="prepare"> <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> + <property name="jboss.server.instance" value="default"/> + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> Modified: stack/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2008-05-02 14:32:07 UTC (rev 6858) +++ stack/metro/trunk/src/main/distro/build.xml 2008-05-02 14:50:45 UTC (rev 6859) @@ -28,6 +28,11 @@ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + <property file="${basedir}/ant.properties"/> + <import file="${build.dir}/build-setup.xml"/> <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/>