Index: deploy/build.xml
===================================================================
diff -u -rfbc8b34b43f7e1577b1c442999e3293dbbf7c244 -r41c0ac09446cc6d5311a9b3b2e0cd8fe8a68dddd
--- deploy/build.xml	(.../build.xml)	(revision fbc8b34b43f7e1577b1c442999e3293dbbf7c244)
+++ deploy/build.xml	(.../build.xml)	(revision 41c0ac09446cc6d5311a9b3b2e0cd8fe8a68dddd)
@@ -73,6 +73,17 @@
 		<property name="deploy.log" value="deploy_production_log.txt" />
 	</target>
 
+	<path id="compile.classpath">
+		<!-- Exclude ASM jar when compiling and unit testing because it conflicts
+		     with the ASM version that spring uses -->
+		<fileset dir="${root}/WEB-INF/lib" includes="**/*.jar" />
+	</path>
+
+	<path id="instrumentation.classpath">
+		<!-- libraries used strictly for testing are loaded from a different location -->
+		<fileset dir="${root}/WEB-INF/lib" includes="**/*.jar" />
+	</path>
+
 	<!-- Prompts the user for username and password for logging in to the deployment server -->
 <!--	<target name="login">
 		<input message="Are you sure you want to deploy to ${deployName}? " validargs="y,yes" />
@@ -133,6 +144,17 @@
 		<copy overwrite="true" file="${log4j}" tofile="${classes}/log4j.properties" />
 	</target>
 
+	<!-- Compile -->
+	<target name="compile" depends="cleanup">
+		<mkdir dir="${classes}" />
+		<echo>${deploy-dir}</echo>
+		<javac target="1.6" srcdir="${src}" destdir="${classes}" classpathref="compile.classpath" debug="true" />
+		<copy todir ="${classes}/">
+			<fileset dir="${src}"
+					 excludes="**/*.java" />
+		</copy>
+	</target>
+
 	<!-- Undeploy the remote tomcat context -->
 	<target name="undeploy" description="Undeploy the app">
 		<undeploy url="${tomcat.manager.url}" username="${username}" password="${password}" path="/" failOnError="false" />
@@ -149,8 +171,8 @@
 		Set production/stage variables
 		Call the shared deploy target
 	-->
-	<target name="deploy_stage" depends="setProperties.stage,deploy_shared" />
-	<target name="deploy_production" depends="setProperties.production,deploy_shared,log_deployment" />
+	<target name="deploy_stage" depends="setProperties.stage,compile,war" />
+	<target name="deploy_production" depends="setProperties.production,compile,war" />
 
 	<!--
 		Delete the temp dir where the war was created from the previous deploy