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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to