Author: dan.j.allen Date: 2009-12-09 15:55:15 -0500 (Wed, 09 Dec 2009) New Revision: 5258 Modified: examples/trunk/build.properties examples/trunk/build.xml Log: to get jboss.home, first check local.build.properties, then build.properties build.properties references the environment variables JBOSS_HOME and CATALINA_HOME by default Modified: examples/trunk/build.properties =================================================================== --- examples/trunk/build.properties 2009-12-09 20:21:45 UTC (rev 5257) +++ examples/trunk/build.properties 2009-12-09 20:55:15 UTC (rev 5258) @@ -1,2 +1,2 @@ -jboss.home=/Applications/jboss-5.2.0.Beta1 +jboss.home=${env.JBOSS_HOME} tomcat.home=/Applications/apache-tomcat-6.0.20 Modified: examples/trunk/build.xml =================================================================== --- examples/trunk/build.xml 2009-12-09 20:21:45 UTC (rev 5257) +++ examples/trunk/build.xml 2009-12-09 20:55:15 UTC (rev 5258) @@ -7,16 +7,14 @@ <property name="maven.dir" location="${wbexamples.dir}/lib/maven" /> + <property environment="env"/><!-- assign OS environment variables to an object visible to ANT --> + <!-- preserve local build.properties if they're still being used --> <property file="${wbexamples.dir}/../jboss-as/local.build.properties" /> <property file="${wbexamples.dir}/local.build.properties" /> - <!-- Use CATALINA_HOME or JBOSS_HOME from OS if no local values are set --> - <property environment="env"/><!-- assign OS environment variables to an object visible to ANT --> - <property name="jboss.home" value="${env.JBOSS_HOME}" /> - <property name="tomcat.home" value="${env.CATALINA_HOME}" /> - <property file="${wbexamples.dir}/../jboss-as/build.properties" /> + <property file="${wbexamples.dir}/build.properties" /> <property name="final.url" value="http://localhost:8080/${example.name}" /> @@ -135,4 +133,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project>