svn commit: r1338643 [2/2] - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/ core/src/main/java/org/apache/struts2/config/ core/src/main/java/org/apache/struts2/dispatcher/ core/src/m
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java?rev=1338643&r1=1338642&r2=1338643&view=diff
==
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
Tue May 15 11:05:50 2012
@@ -15,7 +15,7 @@
*/
package com.opensymphony.xwork2.config.providers;
-import com.opensymphony.xwork2.FileManager;
+import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.config.RuntimeConfiguration;
@@ -51,7 +51,7 @@ public class XmlConfigurationProviderTes
}
};
prov.setObjectFactory(container.getInstance(ObjectFactory.class));
-prov.setFileManager(container.getInstance(FileManager.class));
+
prov.setFileManagerFactory(container.getInstance(FileManagerFactory.class));
prov.init(configuration);
List docs = prov.getDocuments();
assertEquals(3, docs.size());
@@ -74,7 +74,7 @@ public class XmlConfigurationProviderTes
}
public void testNeedsReload() throws Exception {
-container.getInstance(FileManager.class).setReloadingConfigs(true);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
final String filename =
"com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
ConfigurationProvider provider = buildConfigurationProvider(filename);
@@ -150,7 +150,7 @@ public class XmlConfigurationProviderTes
public void testEmptySpaces() throws Exception {
final String filename =
"com/opensymphony/xwork2/config/providers/xwork- test.xml";
-container.getInstance(FileManager.class).setReloadingConfigs(true);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
ConfigurationProvider provider = buildConfigurationProvider(filename);
assertTrue(!provider.needsReload());
@@ -166,7 +166,7 @@ public class XmlConfigurationProviderTes
}
public void testConfigsInJarFiles() throws Exception {
-container.getInstance(FileManager.class).setReloadingConfigs(true);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
testProvider("xwork-jar.xml");
testProvider("xwork-zip.xml");
testProvider("xwork - jar.xml");
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java?rev=1338643&r1=1338642&r2=1338643&view=diff
==
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
Tue May 15 11:05:50 2012
@@ -1,6 +1,7 @@
package com.opensymphony.xwork2.util;
import com.opensymphony.xwork2.FileManager;
+import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import java.io.InputStream;
@@ -20,7 +21,7 @@ public class DefaultFileManagerTest exte
@Override
public void setUp() throws Exception {
super.setUp();
-fileManager = container.getInstance(FileManager.class);
+fileManager =
container.getInstance(FileManagerFactory.class).getFileManager();
}
public void testGetFileInJar() throws Exception {
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java?rev=1338643&r1=1338642&r2=1338643&view=diff
==
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
Tue May 15 11:05:50 2012
@@ -1,124 +1,128 @@
package com.opensymphony.xwork2.util;
+import com.opensymphony.xwork2.FileManager;
+import com.opensymphony.xwork2.util.fs.DefaultFileManager;
import junit.framework.TestCase;
-import java.net.URL;
+import java.io.IOException;
import java.net.Malfor
svn commit: r1338660 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/dispatcher/ plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ xwork-core/src/main/java/com/
Author: lukaszlenart
Date: Tue May 15 11:42:38 2012
New Revision: 1338660
URL: http://svn.apache.org/viewvc?rev=1338660&view=rev
Log:
WW-3820 changes implementation of getInstanceNames(Class type) to return
empty set instead of null
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=1338660&r1=1338659&r2=1338660&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Tue May 15 11:42:38 2012
@@ -741,11 +741,9 @@ public class Dispatcher {
MultiPartRequest mpr = null;
//check for alternate implementations of MultiPartRequest
Set multiNames =
getContainer().getInstanceNames(MultiPartRequest.class);
-if (multiNames != null) {
-for (String multiName : multiNames) {
-if (multiName.equals(multipartHandlerName)) {
-mpr =
getContainer().getInstance(MultiPartRequest.class, multiName);
-}
+for (String multiName : multiNames) {
+if (multiName.equals(multipartHandlerName)) {
+mpr = getContainer().getInstance(MultiPartRequest.class,
multiName);
}
}
if (mpr == null ) {
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java?rev=1338660&r1=1338659&r2=1338660&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
Tue May 15 11:42:38 2012
@@ -35,7 +35,6 @@ import org.apache.struts2.dispatcher.mul
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.velocity.VelocityManager;
-import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
@@ -75,9 +74,6 @@ public class ShowBeansAction extends Act
chosenName = "struts";
}
Set names = container.getInstanceNames(type);
-if (names == null) {
-names = Collections.emptySet();
-}
if (!names.contains(chosenName)) {
bindings.add(new Binding(getInstanceClassName(container, type,
"default"), chosenName, constName, true));
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java?rev=1338660&r1=1338659&r2=1338660&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
Tue May 15 11:42:38 2012
@@ -15,20 +15,16 @@
*/
package com.opensymphony.xwork2;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.UnknownHandler;
-import com.opensymphony.xwork2.UnknownHandlerManager;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwo
svn commit: r1338715 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/dispatcher/ core/src/main/java/org/apache/struts2/dispatcher/multipart/ core/src/main/java/org/apache/struts2/dis
Author: lukaszlenart
Date: Tue May 15 14:10:27 2012
New Revision: 1338715
URL: http://svn.apache.org/viewvc?rev=1338715&view=rev
Log:
WW-3802 moves clean up code to implementation of MultiPartRequest interface
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=1338715&r1=1338714&r2=1338715&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Tue May 15 14:10:27 2012
@@ -74,7 +74,6 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -762,35 +761,13 @@ public class Dispatcher {
*
* @param request the HttpServletRequest object.
* @see org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper
- * @throws java.io.IOException on any error.
*/
-public void cleanUpRequest(HttpServletRequest request) throws IOException {
+public void cleanUpRequest(HttpServletRequest request) {
if (!(request instanceof MultiPartRequestWrapper)) {
return;
}
-
MultiPartRequestWrapper multiWrapper = (MultiPartRequestWrapper)
request;
-
-Enumeration fileParameterNames = multiWrapper.getFileParameterNames();
-while (fileParameterNames != null &&
fileParameterNames.hasMoreElements()) {
-String inputValue = (String) fileParameterNames.nextElement();
-File[] files = multiWrapper.getFiles(inputValue);
-
-for (File currentFile : files) {
-if (LOG.isInfoEnabled()) {
-String msg = LocalizedTextUtil.findText(this.getClass(),
"struts.messages.removing.file", Locale.ENGLISH, "no.message.found", new
Object[]{inputValue, currentFile});
-LOG.info(msg);
-}
-
-if ((currentFile != null) && currentFile.isFile()) {
-if (!currentFile.delete()) {
-if (LOG.isWarnEnabled()) {
-LOG.warn("Resource Leaking: Could not remove
uploaded file '" + currentFile.getCanonicalPath() + "'.");
-}
-}
-}
-}
-}
+multiWrapper.cleanUp();
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?rev=1338715&r1=1338714&r2=1338715&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Tue May 15 14:10:27 2012
@@ -22,6 +22,7 @@
package org.apache.struts2.dispatcher.multipart;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.fileupload.FileItem;
@@ -42,7 +43,9 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.Set;
/**
* Multipart form data request adapter for Jakarta Commons Fileupload package.
@@ -118,6 +121,7 @@ public class JakartaMultiPartRequest imp
}
values.add(item);
+item.delete();
files.put(item.getFieldName(), values);
}
@@ -336,4 +340,24 @@ public class JakartaMultiPartRequest imp
};
}
+/* (non-Javadoc)
+* @see org.apache.struts2.dispatcher.multipart.MultiPartRequest#cleanUp()
+*/
+
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Bigtop (incubating) (https://cwiki.apache.org/confluence/display/BIGTOP) Pages - Bigtop 0.4.0 hackathon May 17, 2012 agenda edited by rvs (05:15 PM) https://cwiki.apache.org/confluence/display/BIGTOP/Bigtop+0.4.0+hackathon+May+17%2C+2012+agenda Requirement for adding a new component to Bigtop distribution created by rvs (05:07 PM) https://cwiki.apache.org/confluence/display/BIGTOP/Requirement+for+adding+a+new+component+to+Bigtop+distribution Apache BVal (https://cwiki.apache.org/confluence/display/BVAL) Pages - inheritance-based cross-parameter method validation created by mbenson (11:52 AM) https://cwiki.apache.org/confluence/display/BVAL/inheritance-based+cross-parameter+method+validation Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Intercept edited by bibryam (09:07 AM) https://cwiki.apache.org/confluence/display/CAMEL/Intercept Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - Fediz Downloads edited by owu...@apache.org (12:10 PM) https://cwiki.apache.org/confluence/display/CXF/Fediz+Downloads Fediz IDP created by owu...@apache.org (12:05 PM) https://cwiki.apache.org/confluence/display/CXF/Fediz+IDP Fediz edited by owu...@apache.org (12:09 PM) https://cwiki.apache.org/confluence/display/CXF/Fediz Fediz Tomcat edited by owu...@apache.org (12:08 PM) https://cwiki.apache.org/confluence/display/CXF/Fediz+Tomcat Fediz Configuration edited by owu...@apache.org (11:02 AM) https://cwiki.apache.org/confluence/display/CXF/Fediz+Configuration Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA) Pages - kafka Detailed Replication Design V3 edited by junrao (12:50 PM) https://cwiki.apache.org/confluence/display/KAFKA/kafka+Detailed+Replication+Design+V3 Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - AOO 4.0 Feature Planning edited by p...@apache.org (09:44 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Feature+Planning Improvements for the download webpages edited by kschenk (05:01 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Improvements+for+the+download+webpages AOO 4.x - Logo Explorations created by greenyo (06:37 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.x+-+Logo+Explorations AOO 3.x - Logo Explorations edited by greenyo (04:11 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.x+-+Logo+Explorations AOOLogo proposal edited by greenyo (04:11 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOOLogo+proposal AOO 4.1 Feature Planning edited by greenyo (03:47 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Feature+Planning Comments https://cwiki.apache.org/confluence/display/OOOUSERS/Improvements+for+the+download+webpages (1) Apache Openmeetings (https://cwiki.apache.org/confluence/display/OPENMEETINGS) Pages - Tutorials related to OpenMeetings edited by megatronic (10:42 AM) https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+related+to+OpenMeetings Apache Struts 2 Wiki (https://cwiki.apache.org/confluence/display/S2WIKI) Comments https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=25202628 (1) Apache Santuario (https://cwiki.apache.org/confluence/display/SANTUARIO) Pages - download edited by cohei...@apache.org (05:04 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/download java_1_5_2_release_notes created by cohei...@apache.org (05:02 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/java_1_5_2_release_notes java_1_4_7_release_notes created by cohei...@apache.org (05:01 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/java_1_4_7_release_notes java_release_notes edited by cohei...@apache.org (05:01 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/java_release_notes old_news edited by cohei...@apache.org (05:00 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/old_news java_index edited by cohei...@apache.org (04:59 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/java_index Index edited by cohei...@apache.org (04:58 AM) https://cwiki.apache.org/confluence/display/SANTUARIO/Index Apache Sling (https://cw
svn commit: r1339021 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Author: lukaszlenart
Date: Wed May 16 05:56:45 2012
New Revision: 1339021
URL: http://svn.apache.org/viewvc?rev=1339021&view=rev
Log:
WW-3802 adds missing statement to delete CGI parameters
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?rev=1339021&r1=1339020&r2=1339021&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Wed May 16 05:56:45 2012
@@ -121,7 +121,6 @@ public class JakartaMultiPartRequest imp
}
values.add(item);
-item.delete();
files.put(item.getFieldName(), values);
}
@@ -146,6 +145,7 @@ public class JakartaMultiPartRequest imp
values.add(item.getString());
}
params.put(item.getFieldName(), values);
+item.delete();
}
private List parseRequest(HttpServletRequest servletRequest,
String saveDir) throws FileUploadException {
