Author: markt
Date: Fri Jun 9 17:31:17 2006
New Revision: 413198
URL: http://svn.apache.org/viewvc?rev=413198&view=rev
Log:
Update common-fileupload version and add missing dependency
Fix deprecation warnings in HTMLManagerServlet
Modified:
tomcat/container/branches/tc4.1.x/build.properties.default
tomcat/container/branches/tc4.1.x/build.xml
tomcat/container/branches/tc4.1.x/catalina/build.xml
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
Modified: tomcat/container/branches/tc4.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.properties.default?rev=413198&r1=413197&r2=413198&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.properties.default (original)
+++ tomcat/container/branches/tc4.1.x/build.properties.default Fri Jun 9
17:31:17 2006
@@ -77,10 +77,16 @@
# ----- Commons FileUpload, version 1.0 or later -----
-commons-fileupload.home=${base.path}/commons-fileupload-1.1
+commons-fileupload.home=${base.path}/commons-fileupload-1.1.1
commons-fileupload.lib=${commons-fileupload.home}
-commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.1.jar
-commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.1.tar.gz
+commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.1.1.jar
+commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.1.1.tar.gz
+
+# ----- Commons IO, version 1.1 or later -----
+commons-io.home=${base.path}/commons-io-1.2
+commons-io.lib=${commons-io.home}
+commons-io.jar=${commons-io.lib}/commons-io-1.2.jar
+commons-io.loc=${base-jakarta.loc}/commons/io/binaries/commons-io-1.2.tar.gz
# ----- Commons Logging, version 1.0.1 or later -----
Modified: tomcat/container/branches/tc4.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?rev=413198&r1=413197&r2=413198&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Fri Jun 9 17:31:17 2006
@@ -453,6 +453,10 @@
<param name="destfile" value="${commons-fileupload.jar}"/>
</antcall>
<antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-io.loc}"/>
+ <param name="destfile" value="${commons-io.jar}"/>
+ </antcall>
+ <antcall target="downloadgz">
<param name="sourcefile" value="${commons-collections.loc}"/>
<param name="destfile" value="${commons-collections.jar}"/>
</antcall>
Modified: tomcat/container/branches/tc4.1.x/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/build.xml?rev=413198&r1=413197&r2=413198&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/build.xml Fri Jun 9 17:31:17
2006
@@ -57,6 +57,7 @@
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-fileupload.jar}"/>
+ <pathelement location="${commons-io.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
@@ -159,6 +160,9 @@
<available property="fileupload.present"
classname="org.apache.commons.fileupload.FileUpload"
classpathref="catalina.classpath"/>
+ <available property="io.present"
+ classname="org.apache.commons.io.IOUtils"
+ classpathref="catalina.classpath"/>
<available property="logging.present"
classname="org.apache.commons.logging.Log"
classpath="${commons-logging.jar}"/>
@@ -234,6 +238,7 @@
<available property="daemon.jar.present" file="${commons-daemon.jar}" />
<available property="dbcp.jar.present" file="${commons-dbcp.jar}" />
<available property="fileupload.jar.present"
file="${commons-fileupload.jar}" />
+ <available property="io.jar.present" file="${commons-io.jar}" />
<available property="jaas.jar.present" file="${jaas.jar}" />
<condition property="javamail.jar.present">
<and>
@@ -592,6 +597,7 @@
<echo message="daemon.present=${daemon.present}" />
<echo message="dbcp.present=${dbcp.present}" />
<echo message="fileupload.present=${fileupload.present}" />
+ <echo message="io.present=${io.present}" />
<echo message="jaas.present=${jaas.present}" />
<echo message="javamail.present=${javamail.present}" />
<echo message="jmx.present=${jmx.present}" />
@@ -614,6 +620,7 @@
<echo message="daemon.jar.present=${daemon.jar.present}" />
<echo message="dbcp.jar.present=${dbcp.jar.present}" />
<echo message="fileupload.jar.present=${fileupload.jar.present}" />
+ <echo message="io.jar.present=${io.jar.present}" />
<echo message="jaas.jar.present=${jaas.jar.present}" />
<echo message="javamail.jar.present=${javamail.jar.present}" />
<echo message="jdbc20ext.jar.present=${jdbc20ext.jar.present}" />
@@ -693,6 +700,10 @@
<copy todir="${catalina.build}/server/lib"
file="${commons-fileupload.jar}"/>
</target>
+ <target name="copy-io.jar" if="io.jar.present">
+ <copy todir="${catalina.build}/server/lib"
+ file="${commons-io.jar}"/>
+ </target>
<target name="copy-jaas.jar" if="copy.jaas.jar">
<copy todir="${catalina.build}/server/lib" file="${jaas.jar}"/>
</target>
@@ -746,7 +757,7 @@
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-daemon.jar,copy-dbcp.jar,copy-fileupload.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
+ <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-daemon.jar,copy-dbcp.jar,copy-fileupload.jar,copy-io.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java?rev=413198&r1=413197&r2=413198&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
Fri Jun 9 17:31:17 2006
@@ -36,8 +36,9 @@
import org.apache.catalina.Host;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
-import org.apache.commons.fileupload.DiskFileUpload;
import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
/**
* Servlet that enables remote management of the web applications installed
@@ -151,14 +152,12 @@
boolean uploadFailed = true;
// Create a new file upload handler
- DiskFileUpload upload = new DiskFileUpload();
+ DiskFileItemFactory factory = new DiskFileItemFactory();
+ factory.setRepository(deployed);
+ ServletFileUpload upload = new ServletFileUpload(factory);
- // Get the tempdir
- File tempdir = (File) getServletContext().getAttribute
- ("javax.servlet.context.tempdir");
// Set upload parameters
upload.setSizeMax(-1);
- upload.setRepositoryPath(tempdir.getCanonicalPath());
// Parse the request
String war = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
