[jboss-svn-commits] JBL Code SVN: r34582 - labs/jbossesb/trunk/product/docs.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2010-08-06 13:33:26 -0400 (Fri, 06 Aug 2010)
New Revision: 34582

Modified:
   labs/jbossesb/trunk/product/docs/build.xml
Log:
Change test for maven.home: JBESB-3443

Modified: labs/jbossesb/trunk/product/docs/build.xml
===================================================================
--- labs/jbossesb/trunk/product/docs/build.xml	2010-08-06 17:07:58 UTC (rev 34581)
+++ labs/jbossesb/trunk/product/docs/build.xml	2010-08-06 17:33:26 UTC (rev 34582)
@@ -9,49 +9,43 @@
 	classpathref="maven-ant-tasks.classpath" />
 
    <property environment="env"/>
-   <property name="maven.home" value="${env.MAVEN_HOME}"/>
+   <condition property="maven.home" value="${env.MAVEN_HOME}">
+      <isset property="env.MAVEN_HOME"/>
+   </condition>
 
-   <macrodef name="maven">
-      <attribute name="options" default="" />
-      <attribute name="goal" />
-      <attribute name="basedir" />
-      <attribute name="resultproperty" default="maven.result" />
-      <element name="args" implicit="true" optional="true" />
-	<sequential>
-		<java classname="org.codehaus.classworlds.Launcher" fork="true"
-			dir="@{basedir}" resultproperty="@{resultproperty}">
-			<jvmarg value="-Xmx512m"/>
-			<classpath>
-				<fileset dir="${maven.home}/boot">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${maven.home}/lib">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-                        <sysproperty key="classworlds.conf" value="${maven.home}/bin/m2.conf" />
-                        <sysproperty key="maven.home" value="${maven.home}" />
-                        <arg line="--batch-mode @{options} @{goal}" />
-                </java>
-         </sequential>
-    </macrodef> 
-
-    <macrodef name="builddoc">
-    	<attribute name="basedir"/>
-    	<sequential>
-    	<maven basedir="${basedir}"
-    	                goal="install"
-    	                resultproperty="result"/>
-    	<echo>RESULT=${result}</echo>
-        </sequential>
-    </macrodef>
-
     <target name="check-maven-install">
     	<condition property="maven.installed">
-    		<isset property="env.MAVEN_HOME"/>
+   	    <and>
+   	        <isset property="maven.home"/>
+    		<length string="${maven.home}" when="greater" length="0"/>
+   	    </and>
     	</condition>
    
-	<fail unless="maven.installed" message="Cannot determine MAVEN_HOME.    Please set the MAVEN_HOME environment variable and retry building."/>
+	<fail unless="maven.installed" message="Cannot determine MAVEN_HOME.    Please set the MAVEN_HOME environment variable or maven.home property and try rebuilding."/>
+        <macrodef name="maven">
+           <attribute name="options" default="" />
+           <attribute name="goal" />
+           <attribute name="basedir" />
+           <attribute name="resultproperty" default="maven.result" />
+           <element name="args" implicit="true" optional="true" />
+	     <sequential>
+		     <java classname="org.codehaus.classworlds.Launcher" fork="true"
+			     dir="@{basedir}" resultproperty="@{resultproperty}">
+			     <jvmarg value="-Xmx512m"/>
+			     <classpath>
+				     <fileset dir="${maven.home}/boot">
+					     <include name="*.jar" />
+				     </fileset>
+				     <fileset dir="${maven.home}/lib">
+					     <include name="*.jar" />
+				     </fileset>
+			     </classpath>
+                             <sysproperty key="classworlds.conf" value="${maven.home}/bin/m2.conf" />
+                             <sysproperty key="maven.home" value="${maven.home}" />
+                             <arg line="--batch-mode @{options} @{goal}" />
+                     </java>
+              </sequential>
+         </macrodef> 
     </target>
    
     <target name="clean">