NIHVIVO-2811 Rewrite the build for vivoCornell; minor tweaks for the others.

utilities/anttasks/src/edu/cornell/mannlib/vitro/utilities/anttasks/AbstractWrappedFileSet.java

@@ -39,6 +39,10 @@ public abstract class AbstractWrappedFileSet implements ResourceCollection {
     	return fileSet.createInclude();
     }
 
+    public PatternSet.NameEntry createExclude() {
+    	return fileSet.createExclude();
+    }
+    
 	@Override
 	public Object clone() {
 		throw new BuildException(this.getClass().getSimpleName()

webapp/build.xml

@@ -27,6 +27,7 @@
 	<property name="war-webinf.dir" location="${war.dir}/WEB-INF" />
 	<property name="war-classes.dir" location="${war-webinf.dir}/classes" />
 	<property name="war-resources.dir" location="${war-webinf.dir}/resources" />
+	<property name="revisionInfo.build.file" location="${war-resources.dir}/revisionInfo.txt" />
 
 	<property name="test-classes.dir" location="${build.dir}/testclasses" />
 
@@ -224,6 +225,14 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		</java>
 	</target>
 
+	<!-- ================================= 
+          target: jar              
+         ================================= -->
+	<target name="jar" depends="test" description="--> Compile the Java, and build a JAR file">
+		<jar basedir="${war-classes.dir}"
+		     destfile="${build.dir}/${ant.project.name}.jar" />
+	</target>
+
 	<!-- ================================= 
           target: revisionInfo              
          ================================= -->
@@ -231,10 +240,6 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 	        depends="test"
 	        unless="skipinfo"
 	        description="--> Store revision info in build">
-
-		<property name="revisionInfo.build.file" location="${war-resources.dir}/revisionInfo.txt" />
-		<delete file="${revisionInfo.build.file}" />
-
 		<tstamp>
 			<format property="revisionInfo.timestamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
@@ -330,7 +335,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		<runLicenserScript productname="Vitro core" propertiesfile="${licenser.properties.file}" />
 	</target>
 
-	
+
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	     MACROS
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

webapp/product-build.xml

@@ -21,9 +21,6 @@
         It should be invoked from the build script of a Vivo product.
     </fail>
 
-	<fail unless="inner.basedir"
-	      message="The build script for the product must define a value for inner.basedir" />
-
 	<!-- 
 		The build directory goes in the product directory. 
 		Everything else hangs from the build directory. 
@@ -56,34 +53,28 @@
 		<mkdir dir="${appbase.dir}/web" />
 
 		<copy todir="${appbase.dir}/web" includeemptydirs="true">
-			<dirDifference dir="${inner.basedir}/web">
+			<dirDifference dir="${corebase.dir}/web">
 				<blockingPath>
 					<pathelement location="${product.modifications.dir}" />
 				</blockingPath>
 			</dirDifference>
-		</copy>
-		<copy todir="${appbase.dir}/web" includeemptydirs="true">
 			<fileset dir="${product.modifications.dir}" />
 		</copy>
 
-		<copy todir="${appbase.dir}/config" includeemptydirs="true">
-			<fileset dir="${inner.basedir}/config" />
-		</copy>
-
 		<copy todir="${appbase.dir}" includeemptydirs="true">
-			<dirDifference dir="${inner.basedir}">
+			<dirDifference dir="${corebase.dir}">
 				<include name="src/**/*" />
 				<include name="lib/**/*" />
 				<include name="test/**/*" />
 				<include name="themes/**/*" unless="skip.core.themes" />
+				<include name="config/*.properties" />
+				<include name="config/solr/*" />
 				<include name="context.xml" />
 				<blockingPath>
 					<pathelement location="." />
 				</blockingPath>
 			</dirDifference>
-		</copy>
-		<copy todir="${appbase.dir}" includeemptydirs="true">
-			<fileset dir="." erroronmissingdir="false">
+			<fileset dir=".">
 				<include name="src/**/*" />
 				<include name="lib/**/*" />
 				<include name="test/**/*" />
@@ -121,23 +112,4 @@
 		<runLicenserScript productname="${ant.project.name}" propertiesfile="${licenser.product.properties.file}" />
 		<runLicenserScript productname="Vitro core" propertiesfile="${licenser.core.properties.file}" />
 	</target>
-
-	<!-- 
-	===========================================================================
-	===========================================================================
-	===========================================================================
-	NOT YET USING ANYTHING BELOW HERE
-	===========================================================================
-	===========================================================================
-	===========================================================================
-	-->
-
-	<!-- ================================= 
-          target: jar              
-         ================================= -->
-	<target name="jar" depends="revisionInfo" description="--> Build the app and create a JAR file">
-		<jar basedir="${build.dir}/war/WEB-INF/classes"
-		     destfile="${build.dir}/${webapp.name}.jar" />
-	</target>
-
 </project>