tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkuhn...@apache.org
Subject svn commit: r463552 - in /tapestry/tapestry4/trunk: ./ src/site/xdoc/components/form/ tapestry-framework/src/java/org/apache/tapestry/form/ tapestry-framework/src/scripts/ tapestry-framework/src/test-data/context19/
Date Fri, 13 Oct 2006 02:48:34 GMT
Author: jkuhnert
Date: Thu Oct 12 19:48:32 2006
New Revision: 463552

URL: http://svn.apache.org/viewvc?view=rev&rev=463552
Log:
Upgraded dependencies which include the new commons-fileupload fix for filenames.

Added:
    tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context19/Tapestry-Banner.png
      - copied unchanged from r463535, tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context19/tapestry-banner.png
Removed:
    tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context19/tapestry-banner.png
Modified:
    tapestry/tapestry4/trunk/pom.xml
    tapestry/tapestry4/trunk/src/site/xdoc/components/form/Upload.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Upload.java
    tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestUpload.xml

Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=463552&r1=463551&r2=463552
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Thu Oct 12 19:48:32 2006
@@ -128,7 +128,7 @@
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <version>1.1</version>
                 <!-- This is almost always provided by the container. If not, then WARs
will have to
                     create an explicit dependency. -->
                 <scope>provided</scope>
@@ -170,7 +170,7 @@
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
-                <version>1.1</version>
+                <version>1.1.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-beanutils</groupId>

Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/form/Upload.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/Upload.xml?view=diff&rev=463552&r1=463551&r2=463552
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/form/Upload.xml (original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/form/Upload.xml Thu Oct 12 19:48:32
2006
@@ -66,17 +66,7 @@
                     ServletMultipartDecoder
                 </a>
             </p>
-
-            <span class="warn">
-                <strong>Warning:</strong>
-                <p>
-                There is a bug in the current fileupload 1.1 version which resolves all filenames
to
-                lowercase, this may break certain conditions for people if they are doing
file name
-                comparisons. This issue has already been fixed in commons-fileupload version
1.2,
-                which should hopefully be released soon.
-                </p>
-            </span>
-
+            
             <section name="Parameters">
 
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Upload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Upload.java?view=diff&rev=463552&r1=463551&r2=463552
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Upload.java
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Upload.java
Thu Oct 12 19:48:32 2006
@@ -46,7 +46,7 @@
     {
         // Force the form to use the correct encoding type for file uploads.
         IForm form = getForm();
-
+        
         form.setEncodingType("multipart/form-data");
 
         renderDelegatePrefix(writer, cycle);
@@ -81,7 +81,7 @@
     {
         IUploadFile file = getDecoder().getFileUpload(getName());
         
-        if (HiveMind.isBlank(file.getFileName()))
+        if (file != null && HiveMind.isBlank(file.getFileName()))
         {
             file = null;
         }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestUpload.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestUpload.xml?view=diff&rev=463552&r1=463551&r2=463552
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestUpload.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestUpload.xml Thu Oct 12 19:48:32
2006
@@ -130,11 +130,11 @@
 		</assert-output>
 		
 		<assert-output name="Path">
-		Path: [context19/tapestry-banner.png]
+		Path: [context19/Tapestry-Banner.png]
 		</assert-output>
 		
 		<assert-output name="Name">
-		Name: [tapestry-banner.png]
+		Name: [Tapestry-Banner.png]
 		</assert-output>
 		
 		<assert-output name="Match Confirmation">



Mime
View raw message