X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=a2cae7f9759e1c9a83e205854805344934a1b0e0;hb=81fe0e97b0e8b642fed42495cd61ea1c8526e6b5;hp=d44bc0a13c93154e2440d711f5f5ac1bb50594c4;hpb=37613604779a1d5d3278e925cb737ba0fb3c9091;p=vamsas.git

diff --git a/build.xml b/build.xml
index d44bc0a..a2cae7f 100644
--- 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,6 +122,11 @@ 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>
@@ -128,7 +134,11 @@ inheritRefs="true"/> -->
 	<target name="javadoc" depends="init">
   	<javadoc destdir="docs/api" 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>