Small fixes and adjustments to build.xml.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@389540 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index f245617..3d5ad2c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -31,6 +31,19 @@
   <property name="test.failonerror"  value="true"/>\r
   <property name="test.runner"       value="junit.textui.TestRunner"/>\r
 \r
+  <!-- Can't be lower - jsp uses templates -->\r
+  <property name="compile.source" value="1.5"/>\r
+  \r
+  <!-- Defaults, if build.properties is missing. It is sometimes easier to \r
+       just have one build file, and use properties to just override settings -->\r
+  <property name="TOMCAT_LIBS_BASE" location="../repository"/>\r
+  \r
+  <property name="ant.jar" location="${TOMCAT_LIBS_BASE}/apache-ant-1.6.5/lib/ant.jar"/>\r
+  <property name="jdt.jar" location="${TOMCAT_LIBS_BASE}/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar"/>\r
+  <property name="commons-logging.jar" location="${TOMCAT_LIBS_BASE}/commons-logging-1.0.4/commons-logging.jar"/>\r
+  <property name="commons-modeler.jar" location="${TOMCAT_LIBS_BASE}/commons-modeler-1.1/commons-modeler.jar"/>\r
+      \r
+  \r
   <!-- JAR artifacts -->\r
   <property name="servlet-api.jar" value="${tomcat.build}/common/lib/servlet-api.jar"/>\r
   <property name="jsp-api.jar" value="${tomcat.build}/common/lib/jsp-api.jar"/>\r
@@ -61,7 +74,7 @@
 \r
   </target>\r
 \r
-  <target name="build-only" depends="build-prepare">\r
+  <target name="compile">\r
 \r
     <!-- Compile internal server components -->\r
     <javac srcdir="java" destdir="${tomcat.classes}"\r
@@ -72,8 +85,9 @@
            excludes="**/CVS/**,**/.svn/**">\r
       <classpath refid="tomcat.classpath" />\r
       <exclude name="org/apache/tomcat/util/net/puretls/**" />\r
+      <exclude name="org/apache/naming/factory/MailSessionFactory.java"/>\r
+      <exclude name="org/apache/naming/factory/SendMailFactory.java"/>\r
     </javac>\r
-\r
     <!-- Copy static resource files -->\r
     <copy todir="${tomcat.classes}">\r
       <fileset dir="java">\r
@@ -82,6 +96,11 @@
       </fileset>\r
     </copy>\r
 \r
+  </target>\r
+    \r
+  <target name="build-only" depends="build-prepare,compile,package" />\r
+  \r
+  <target name="package" >  \r
     <!-- Servlet 2.5 Implementation JAR File -->\r
     <jar  jarfile="${servlet-api.jar}">\r
       <fileset dir="${tomcat.classes}">\r