ambiguous import of 'Lock' removed.

[vamsas.git] / build.xml

diff --git a/build.xml b/build.xml
index ae600aa..a2cae7f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -45,12 +45,13 @@
                <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}"
@@ -123,7 +124,6 @@ inheritRefs="true"/> -->
                  <exclude name="**/*.jar.*" />
                          <exclude name="*.java"/>
                          <exclude name="**/*.java"/>
-                         <exclude name="uk/**"/>
                          <exclude name="uk/*.class"/>
                          <exclude name="log4j.properties"/>
                        <exclude name="commons-logging.properties"/>