Author: ekoneil
Date: Wed Jan  5 19:52:43 2005
New Revision: 124342

URL: http://svn.apache.org/viewcvs?view=rev&rev=124342
Log:
Fixup to switch from classpath to classpathref in preparation for the Ant 1.6 
build cleanup that's underway.

BB: self
DRT: NetUI pass


Modified:
   incubator/beehive/trunk/netui/ant/xmlBean.xml

Modified: incubator/beehive/trunk/netui/ant/xmlBean.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/xmlBean.xml?view=diff&rev=124342&p1=incubator/beehive/trunk/netui/ant/xmlBean.xml&r1=124341&p2=incubator/beehive/trunk/netui/ant/xmlBean.xml&r2=124342
==============================================================================
--- incubator/beehive/trunk/netui/ant/xmlBean.xml       (original)
+++ incubator/beehive/trunk/netui/ant/xmlBean.xml       Wed Jan  5 19:52:43 2005
@@ -1,14 +1,17 @@
 <?xml version="1.0"?>
 
-<project name="Beehive/NetUI/XMLBean Build" default="ant.build.xmlbean" 
basedir=".">
+<project name="Beehive/NetUI/XMLBeanBuild" default="ant.build.xmlbean" 
basedir=".">
 
     <property environment="os"/>
     <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
-    <property file="netui.properties"/>
+
+    <path id="xbean.classpath">
+        <pathelement path="${xbean.jar}"/>
+        <pathelement path="${jsr173.jar}"/>
+    </path>
 
     <target name="ant.build.xmlbean" description="Compile a set of XSDs using 
the XMLBean Ant task">
-        <fail unless="xsd.root.dir" 
-              message="xsd.root.dir must be specified to build an XMLBean in 
order find the existing files"/>
+        <fail unless="xsd.root.dir" message="xsd.root.dir must be specified to 
build an XMLBean in order find the existing files"/>
         <fail unless="class.output.dir" message="class.output.dir must be 
specified in order to bulid an XMLBean"/>
         <fail unless="xbean.inputs" message="xbean.inputs must be specified"/>
         <fail unless="xbean.output" message="xbean.output must be specified"/>
@@ -24,17 +27,18 @@
             <srcfiles refid="xbean.sources"/>
         </uptodate>
 
-        <echo>uptodate: ${xbean.uptodate}</echo>
-
         <!-- if needed, build the ${xbean.inputs} into the ${class.output.dir} 
-->
         <antcall target="xbean_schema_compiler"/>
     </target>
 
     <target name="xbean_schema_compiler" unless="xbean.uptodate">
-        <taskdef name="xmlbeanbuild" 
classname="org.apache.xmlbeans.impl.tool.XMLBean" 
-                 classpath="${xbean.jar};${jsr173.jar}"/>
-        <xmlbeanbuild classpath="${xbean.jar};${jsr173.jar}" 
schema="${xsd.root.dir}" 
-                      classgendir="${class.output.dir}" failonerror="true"/>
+        <taskdef name="xmlbeanbuild" 
+                 classname="org.apache.xmlbeans.impl.tool.XMLBean" 
+                 classpathref="xbean.classpath"/>
+        <xmlbeanbuild classpathref="xbean.classpath"
+                      schema="${xsd.root.dir}" 
+                      classgendir="${class.output.dir}" 
+                      failonerror="true"/>
     </target>
 
 </project>

Reply via email to