Author: remm
Date: Tue May 29 06:38:39 2007
New Revision: 542513
URL: http://svn.apache.org/viewvc?view=rev&rev=542513
Log:
- Build updates for svn layout.
- JDK 1.5 build compatibility (JDK 1.4 should still be used to build real
releases, though).
Modified:
tomcat/container/branches/tc5.0.x/catalina/build.xml
tomcat/container/branches/tc5.0.x/tester/build.xml
tomcat/container/branches/tc5.0.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/container/branches/tc5.0.x/webapps/manager/build.xml
Modified: tomcat/container/branches/tc5.0.x/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/catalina/build.xml?view=diff&rev=542513&r1=542512&r2=542513
==============================================================================
--- tomcat/container/branches/tc5.0.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc5.0.x/catalina/build.xml Tue May 29 06:38:39
2007
@@ -42,6 +42,8 @@
<property name="tomcat-http11.jar"
value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
+ <property name="compile.source" value="1.4"/>
+
<!-- Construct Catalina classpath -->
<path id="catalina.classpath">
<pathelement location="${activation.jar}"/>
@@ -591,6 +593,7 @@
<javac srcdir="src/share" destdir="${classes.dir}"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
+ source="${compile.source}"
excludes="**/CVS/**">
<classpath refid="catalina.classpath" />
Modified: tomcat/container/branches/tc5.0.x/tester/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/tester/build.xml?view=diff&rev=542513&r1=542512&r2=542513
==============================================================================
--- tomcat/container/branches/tc5.0.x/tester/build.xml (original)
+++ tomcat/container/branches/tc5.0.x/tester/build.xml Tue May 29 06:38:39 2007
@@ -16,6 +16,8 @@
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="servlet-api.jar"
value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
+ <property name="compile.source" value="1.4"/>
+
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
<mkdir dir="${tester.build}"/>
@@ -61,6 +63,7 @@
<javac srcdir="src/tester" destdir="${tester.build}/classes"
classpath="${ant.jar}:${servlet-api.jar}:${xercesImpl.jar}"
deprecation="off" debug="on" optimize="off"
+ source="${compile.source}"
excludes="**/CVS/**"/>
<!-- Copy static resource files -->
Modified:
tomcat/container/branches/tc5.0.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java?view=diff&rev=542513&r1=542512&r2=542513
==============================================================================
---
tomcat/container/branches/tc5.0.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/container/branches/tc5.0.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Tue May 29 06:38:39 2007
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
+import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.DiskFileUpload;
Modified: tomcat/container/branches/tc5.0.x/webapps/manager/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/webapps/manager/build.xml?view=diff&rev=542513&r1=542512&r2=542513
==============================================================================
--- tomcat/container/branches/tc5.0.x/webapps/manager/build.xml (original)
+++ tomcat/container/branches/tc5.0.x/webapps/manager/build.xml Tue May 29
06:38:39 2007
@@ -18,6 +18,8 @@
<property name="servlet-api.jar"
value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
<property name="jsp-api.jar"
value="${api.home}/jsr152/dist/lib/jsp-api.jar"/>
+ <property name="compile.source" value="1.4"/>
+
<!-- Construct Admin classpath -->
<path id="manager.classpath">
<pathelement location="${catalina.deploy}/classes"/>
@@ -75,6 +77,7 @@
destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
+ source="${compile.source}"
excludes="**/CVS/**">
<classpath refid="manager.classpath" />
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
