refactored initialisation of new session with existing document code.

[vamsas.git] / build.xml

diff --git a/build.xml b/build.xml
index d44bc0a..575c193 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,8 @@
                <property name="vamsasClient.jar" value="vamsas-client.jar" />
                <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.package" value="uk.ac.vamsas.objects.core" />
+               <property name="vamsas.schema.package.src" value="uk/ac/vamsas/objects/core" />
                <property name="vamsas.schema.sourcegen.properties" value="schemas/castorbuilder.properties"/>
                <path id="castor.classpath">
                        <fileset dir="tools">
@@ -45,25 +45,26 @@
                <delete>
                        <fileset dir="${sourceDir}/${vamsas.schema.package.src}">
                                <include name="*.java"/>
+                               <include name="descriptors/*.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"
+                 classname="org.castor.anttask.CastorCodeGenTask"
              classpathref="castor.classpath" />
        <!-- Should apply this to every schema file in ${vamsas.schemas} directory -->
                <castor-srcgen file="${vamsas.schema}"
              todir="${sourceDir}"
              package="${vamsas.schema.package}"
-             warnings="false" 
+             warnings="true" 
                  nodesc="false"
                properties="${vamsas.schema.sourcegen.properties}"
        />      
                <castor-srcgen file="${vamsas.doc.schema}"
                              todir="${sourceDir}"
                              package="${vamsas.schema.package}"
-                             warnings="false" 
+                             warnings="true" 
                                  nodesc="false"
                                properties="${vamsas.schema.sourcegen.properties}"
                        />      
@@ -109,11 +110,11 @@ inheritRefs="true"/> -->
 
        <target name="build" depends="init, prepare">
                <!-- not efficient yet. : use excludes="*/localtest/*.java" if local tests are not building -->
-               <javac classpathref="build.classpath" debug="on" srcdir="${sourceDir}" destdir="${outputDir}" deprecation="on" >
+               <javac classpathref="build.classpath" debug="on" srcdir="${sourceDir}" destdir="${outputDir}" deprecation="on" source="1.4" target="1.4">
        <exclude name="uk/ac/ebi/msd/vamsas/**"/>
                </javac>
        </target>
-       <target name="jar" depends="build">
+       <target name="jar" depends="build, javadoc">
                <jar destfile="${packageDir}/${vamsasClient.jar}">
                <fileset dir="${outputDir}">
                  <exclude name="cache*/**"/>
@@ -121,14 +122,23 @@ inheritRefs="true"/> -->
                  <exclude name="*.jar.*" />
                  <exclude name="**/*.jar" />
                  <exclude name="**/*.jar.*" />
+                         <exclude name="*.java"/>
+                         <exclude name="**/*.java"/>
+                         <exclude name="uk/*.class"/>
+                         <exclude name="log4j.properties"/>
+                       <exclude name="commons-logging.properties"/>
                </fileset>
                </jar>
        </target>
        
        <target name="javadoc" depends="init">
-       <javadoc destdir="docs/api" author="true" version="true" use="true">      
+       <javadoc destdir="docs/api"  classpathref="build.classpath" author="true" version="true" use="true">      
       <fileset dir="${sourceDir}" defaultexcludes="yes">
-      </fileset>
+       <exclude name="**/.castor.cdr"/>
+       <!-- this was for the old ebi packages.
+       <exclude name="uk/**"/>
+       <exclude name="uk/*.java"/> -->
+           </fileset>
     </javadoc>
   </target>