Return-Path: 
 <commons-dev-return-100176-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 78684 invoked from network); 20 Mar 2007 07:29:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Mar 2007 07:29:54 -0000
Received: (qmail 19151 invoked by uid 500); 20 Mar 2007 07:30:00 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 18951 invoked by uid 500); 20 Mar 2007 07:29:58 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 18940 invoked by uid 500); 20 Mar 2007 07:29:58 -0000
Received: (qmail 18936 invoked by uid 99); 20 Mar 2007 07:29:58 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2007 00:29:58 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2007 00:29:50 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id E985D1A9838; Tue, 20 Mar 2007 00:29:29 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r520302 - in /jakarta/commons/proper/fileupload/trunk:
 pom.xml
 project.xml src/changes/changes.xml
 src/test/org/apache/commons/fileupload/MockHttpServletRequest.java
Date: Tue, 20 Mar 2007 07:29:29 -0000
To: commons-cvs@jakarta.apache.org
From: jochen@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070320072929.E985D1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jochen
Date: Tue Mar 20 00:29:28 2007
New Revision: 520302

URL: http://svn.apache.org/viewvc?view=rev&rev=520302
Log:
Made the MockHttpServletRequest comply to the servlet 2.4 specification
by applying http://www.sourcelabs.com/dashboards/sash-1.2/patches/commons-fileupload-1.1-1/SUP-520.diff
PR: FILEUPLOAD-129

Modified:
    jakarta/commons/proper/fileupload/trunk/pom.xml
    jakarta/commons/proper/fileupload/trunk/project.xml
    jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml
    jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/MockHttpServletRequest.java

Modified: jakarta/commons/proper/fileupload/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/pom.xml?view=diff&rev=520302&r1=520301&r2=520302
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/pom.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/pom.xml Tue Mar 20 00:29:28 2007
@@ -160,7 +160,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: jakarta/commons/proper/fileupload/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/project.xml?view=diff&rev=520302&r1=520301&r2=520302
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/project.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/project.xml Tue Mar 20 00:29:28 2007
@@ -180,7 +180,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <url>http://java.sun.com/products/servlet/</url>
       <properties>
         <scope>provided</scope>

Modified: jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml?view=diff&rev=520302&r1=520301&r2=520302
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml Tue Mar 20 00:29:28 2007
@@ -46,6 +46,11 @@
         Upgrade to commons-io-1.4-SNAPSHOT, in order to use the new
         FileCleaningTracker and fix issues with FileCleaner.
       </action>
+      <action dev="jochen" type="fix" issue="FILEUPLOAD-129">
+        Made the MockHttpServletRequest comply to the servlet 2.4 specification
+        by applying
+        http://www.sourcelabs.com/dashboards/sash-1.2/patches/commons-fileupload-1.1-1/SUP-520.diff
+      </action>
     </release>
 
 	<release version="1.2" date="2007-02-13">

Modified: jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/MockHttpServletRequest.java?view=diff&rev=520302&r1=520301&r2=520302
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/MockHttpServletRequest.java (original)
+++ jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/MockHttpServletRequest.java Tue Mar 20 00:29:28 2007
@@ -402,6 +402,14 @@
 	}
 
 	/**
+	 * @see javax.servlet.ServletRequest#getLocalName()
+	 */
+	public String getLocalName()
+	{
+	    return null;
+	}
+
+    /**
 	 * @see javax.servlet.ServletRequest#getServerPort()
 	 */
 	public int getServerPort()
@@ -410,6 +418,22 @@
 	}
 
 	/**
+	 * @see javax.servlet.ServletRequest#getLocalPort()
+	 */
+	public int getLocalPort()
+	{
+	    return 0;
+	}
+
+	/**
+	 * @see javax.servlet.ServletRequest#getRemotePort()
+	 */
+	public int getRemotePort()
+	{
+	    return 0;
+	}
+
+    /**
 	 * @see javax.servlet.ServletRequest#getReader()
 	 */
 	public BufferedReader getReader() throws IOException
@@ -426,6 +450,14 @@
 	}
 
 	/**
+	 * @see javax.servlet.ServletRequest#getLocalAddr()
+	 */
+	public String getLocalAddr()
+	{
+	    return null;
+	}
+
+    /**
 	 * @see javax.servlet.ServletRequest#getRemoteHost()
 	 */
 	public String getRemoteHost()



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org