simple test of locked IO based on ArchiveWatcher. Extend this to quickly incorporate...

[vamsas.git] / build.xml

diff --git a/build.xml b/build.xml
index 3cb48c6..d42cc2e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -3,14 +3,16 @@
 
        <target name="init">
                <property name="libDir" value="lib"/>
+               <property name="toolsDir" value="tools"/>
                <property name="resourceDir" value="resources"/>
                <property name="sourceDir" value="src" />
                <property name="outputDir" value="classes" />
                <property name="packageDir" value="packages" />
-               <property name="vamsas.schema" value="schemas/vamsas15_9.xsd" />
+               <property name="vamsas.schema" value="schemas/vamsas.xsd" />
+               <property name="vamsas.doc.schema" value="schemas/vamsasDocument.xsd" />
                <property name="vamsas.schema.package" value="org.vamsas.objects.core" />
+               <property name="vamsas.schema.package.src" value="org/vamsas/objects/core" />
                <property name="vamsas.schema.sourcegen.properties" value="schemas/castorbuilder.properties"/>
-                                               
                <path id="castor.classpath">
                        <fileset dir="tools">
                                <include name="*.jar"/>
@@ -26,7 +28,7 @@
                Build classpath
                -->
                <path id="build.classpath">
-                       <fileset dir="utils">
+                       <fileset dir="${toolsDir}">
                                <include name="*.jar"/>
                                <include name="**/*.jar"/>
                        </fileset>
@@ -38,18 +40,32 @@
                        <!--            path refid="axis.classpath"  -->
                </path>
        </target>
-       <target name="makecoresource" depends="init" description="Generate Java source files from XSD.">
+       <target name="cleancoresource" depends="init" description="Clean automatically generated packages">
+               <delete>
+                       <fileset dir="${sourceDir}/${vamsas.schema.package.src}">
+                               <include name="*.java"/>
+                       </fileset>
+               </delete>
+       </target>
+       <target name="makecoresource" depends="init, cleancoresource" description="Generate Java source files from XSD.">
        <taskdef name="castor-srcgen"
                  classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
              classpathref="castor.classpath" />
-       <castor-srcgen file="${vamsas.schema}"
+       <!-- Should apply this to every schema file in ${vamsas.schemas} directory -->
+               <castor-srcgen file="${vamsas.schema}"
              todir="${sourceDir}"
              package="${vamsas.schema.package}"
              warnings="false" 
-                 nodesc="true"
+                 nodesc="false"
                properties="${vamsas.schema.sourcegen.properties}"
-       />
-       
+       />      
+               <castor-srcgen file="${vamsas.doc.schema}"
+                             todir="${sourceDir}"
+                             package="${vamsas.schema.package}"
+                             warnings="false" 
+                                 nodesc="false"
+                               properties="${vamsas.schema.sourcegen.properties}"
+                       />      
        </target>
        <target name="prepare" depends="init">
                <mkdir dir="${packageDir}"/>