X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=575c193aeb0e7048cb0cd8a29f81b9c06323b7ad;hb=d6f378ff4d767169376e6f2489a00b75d8a36e39;hp=303c160dd0921dbcc9cb432be959359752c3a724;hpb=ab3c2e69dc9bd0902a021c2cf6dafc1ddf338b3b;p=vamsas.git

diff --git a/build.xml b/build.xml
index 303c160..575c193 100644
--- 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"/>
@@ -132,12 +132,13 @@ inheritRefs="true"/> -->
 	</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">
+      	<exclude name="**/.castor.cdr"/>
+      	<!-- this was for the old ebi packages.
       	<exclude name="uk/**"/>
-      	<exclude name="uk/*.java"/>
-      	<exclude name=".castor.cdr"/>
-      </fileset>
+      	<exclude name="uk/*.java"/> -->
+	    </fileset>
     </javadoc>
   </target>