Author: kwright
Date: Wed Feb 26 07:47:23 2014
New Revision: 1571947
URL: http://svn.apache.org/r1571947
Log:
Fix for CONNECTORS-903
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1571947&r1=1571946&r2=1571947&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Feb 26 07:47:23 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-903: Remove deprecation warnings from framework.
+(Karl Wright)
+
CONNECTORS-901: Clean up httpclient-related deprecation warnings.
(Karl Wright)
Modified:
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java?rev=1571947&r1=1571946&r2=1571947&view=diff
==============================================================================
---
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
(original)
+++
manifoldcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/multipart/MultipartWrapper.java
Wed Feb 26 07:47:23 2014
@@ -21,6 +21,8 @@ package org.apache.manifoldcf.ui.multipa
import org.apache.manifoldcf.core.interfaces.*;
import org.apache.manifoldcf.ui.beans.AdminProfile;
import org.apache.commons.fileupload.*;
+import org.apache.commons.fileupload.disk.*;
+import org.apache.commons.fileupload.servlet.*;
import javax.servlet.*;
import javax.servlet.http.*;
import java.util.*;
@@ -50,7 +52,7 @@ public class MultipartWrapper implements
this.adminProfile = adminProfile;
// Check that we have a file upload request
- boolean isMultipart = FileUpload.isMultipartContent(request);
+ boolean isMultipart = ServletFileUpload.isMultipartContent(request);
if (!isMultipart)
{
this.request = request;
@@ -60,10 +62,10 @@ public class MultipartWrapper implements
// It is multipart!
// Create a factory for disk-based file items
- DefaultFileItemFactory factory = new DefaultFileItemFactory();
+ DiskFileItemFactory factory = new DiskFileItemFactory();
// Create a new file upload handler
- DiskFileUpload upload = new DiskFileUpload(factory);
+ ServletFileUpload upload = new ServletFileUpload(factory);
// Parse the request
try
