[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Road map for JEE6 Web Profile was last edited by drwoods (02:27 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Road+map+for+JEE6+Web+Profile Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Async was last edited by davsclaus (09:13 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Async |-- Camel DSL was last edited by christian schneider (03:14 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+DSL |-- Aggregator was last edited by davsclaus (04:43 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Aggregator |-- FTP2 was last edited by davsclaus (02:32 AM). | http://cwiki.apache.org/confluence/display/CAMEL/FTP2 |-- FTP was last edited by davsclaus (02:30 AM). | http://cwiki.apache.org/confluence/display/CAMEL/FTP |-- GSoC 2009 was last edited by xueqiang.mi (01:40 AM). | http://cwiki.apache.org/confluence/display/CAMEL/GSoC+2009 Apache Wink (WINK) http://cwiki.apache.org/confluence/display/WINK | |-Pages Added or Edited in This Space |-- Index was last edited by nickgallardo (06:23 AM). | http://cwiki.apache.org/confluence/display/WINK/Index Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- jQuery plugin was last edited by jogep (08:12 AM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/jQuery+plugin Apache Shindig (SHINDIG) http://cwiki.apache.org/confluence/display/SHINDIG | |-Pages Added or Edited in This Space |-- OAuthSessionFixationAttack was last edited by bea...@google.com (10:49 PM). | http://cwiki.apache.org/confluence/display/SHINDIG/OAuthSessionFixationAttack Apache Geronimo v2.2 (GMOxDOC22) http://cwiki.apache.org/confluence/display/GMOxDOC22 | |-Pages Added or Edited in This Space |-- Documentation was last edited by sophia (10:47 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Documentation |-- Geronimo GShell Commands was last edited by chirun...@gmail.com (07:33 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Geronimo+GShell+Commands Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Board Report (2009-06) was created by he...@ungoverned.org (09:59 AM). | http://cwiki.apache.org/confluence/display/FELIX/Board+Report+%282009-06%29 |-- Committers was last edited by he...@ungoverned.org (09:44 AM). | http://cwiki.apache.org/confluence/display/FELIX/Committers Apache Etch (ETCH) http://cwiki.apache.org/confluence/display/ETCH | |-Pages Added or Edited in This Space |-- Checking a Release was created by sccomer (04:50 PM). | http://cwiki.apache.org/confluence/display/ETCH/Checking+a+Release |-- Get Involved was last edited by sccomer (04:37 PM). | http://cwiki.apache.org/confluence/display/ETCH/Get+Involved Apache MINA FtpServer (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Releasing was last edited by ngn (01:11 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Releasing Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- Sample Camel Routes was created by jgomes (05:22 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Sample+Camel+Routes |-- JMS Bridge With Oracle AQ was created by jgomes (05:22 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/JMS+Bridge+With+Oracle+AQ |-- User Submitted Configurations was last edited by jgomes (05:22 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/User+Submitted+Configurations |-- Connection To Oracle AQ was created by jgomes (05:18 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Connection+To+Oracle+AQ |-- JMS Bridge With Remote TIBCO Broker was created by jgomes (05:17 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/JMS+Bridge+With+Remote+TIBCO+Broker |-- JMS Bridge With Local Broker was created by jgomes (04:56 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/JMS+Bridge+With+Local+Broker |-- JMS Bridge With Remote Broker was created by jgomes (05:07 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/JMS+Bridge+With+Remote+Broker |-- Team was last edited by cmacnaug (01:35 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Team |-- Complex Single Broker Configuration (Stomp only) was created by jgomes (12:09 PM). | htt
svn commit: r783008 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/StrutsConstants.java java/org/apache/struts2/dispatcher/Dispatcher.java resources/struts-default.xml
Author: wesw
Date: Tue Jun 9 14:12:23 2009
New Revision: 783008
URL: http://svn.apache.org/viewvc?rev=783008&view=rev
Log:
Updating core to support pluggable upload capabilities WW-3100
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=783008&r1=783007&r2=783008&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Tue Jun 9 14:12:23 2009
@@ -116,6 +116,11 @@
public static final String STRUTS_MULTIPART_SAVEDIR =
"struts.multipart.saveDir";
/**
+ * The name of the bean that will handle multipart requests
+ */
+public static final String STRUTS_MULTIPART_HANDLER =
"struts.multipart.handler";
+
+/**
* The org.apache.struts2.dispatcher.multipart.MultiPartRequest parser
implementation
* for a multipart request (file upload)
*/
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=783008&r1=783007&r2=783008&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 Jun 9 14:12:23 2009
@@ -59,6 +59,7 @@
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.UnknownHandler;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.ConfigurationManager;
@@ -135,6 +136,11 @@
private String multipartSaveDir;
/**
+ * Stores the value of StrutsConstants.STRUTS_MULTIPART_HANDLER setting
+ */
+private String multipartHandlerName;
+
+/**
* Provide list of default configuration files.
*/
private static final String DEFAULT_CONFIGURATION_PATHS =
"struts-default.xml,struts-plugin.xml,struts.xml";
@@ -237,6 +243,11 @@
multipartSaveDir = val;
}
+@Inject(StrutsConstants.STRUTS_MULTIPART_HANDLER)
+public void setMultipartHandler(String val) {
+multipartHandlerName = val;
+}
+
@Inject
public void setValueStackFactory(ValueStackFactory valueStackFactory) {
this.valueStackFactory = valueStackFactory;
@@ -682,8 +693,20 @@
String content_type = request.getContentType();
if (content_type != null &&
content_type.indexOf("multipart/form-data") != -1) {
-MultiPartRequest multi =
getContainer().getInstance(MultiPartRequest.class);
-request = new MultiPartRequestWrapper(multi, request,
getSaveDir(servletContext));
+MultiPartRequest mpr = null;
+//add all available UnknownHandlers
+Set multiNames =
getContainer().getInstanceNames(MultiPartRequest.class);
+if (multiNames != null) {
+for (String multiName : multiNames) {
+if (multiName.equals(multipartHandlerName)) {
+mpr =
getContainer().getInstance(MultiPartRequest.class, multiName);
+}
+}
+}
+if (mpr == null ) {
+mpr = getContainer().getInstance(MultiPartRequest.class);
+}
+request = new MultiPartRequestWrapper(mpr, request,
getSaveDir(servletContext));
} else {
request = new StrutsRequestWrapper(request);
}
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=783008&r1=783007&r2=783008&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Tue Jun 9
14:12:23 2009
@@ -46,6 +46,7 @@
+
svn commit: r783009 - in /struts/sandbox/trunk/struts2-fileupload-plugin: ./ src/main/java/org/apache/struts2/fileupload/ src/main/resources/
Author: wesw
Date: Tue Jun 9 14:13:34 2009
New Revision: 783009
URL: http://svn.apache.org/viewvc?rev=783009&view=rev
Log:
Seems to be working, tested with showcase WW-3100
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
Modified: struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml?rev=783009&r1=783008&r2=783009&view=diff
==
--- struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml Tue Jun 9 14:13:34
2009
@@ -38,13 +38,11 @@
commons-fileupload
commons-fileupload
1.2.1
-compile
org.apache.struts
struts2-core
2.1.7-SNAPSHOT
-compile
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java?rev=783009&r1=783008&r2=783009&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
Tue Jun 9 14:13:34 2009
@@ -52,20 +52,16 @@
* @param sizeThreshold
* @param repositoryPath
*/
+@Inject
public DiskFileItemFactoryWrapper(
-@Inject(FileUploadConstants.SIZE_THRESHOLD)
-String sizeThreshold,
-@Inject(FileUploadConstants.FILE_REPOSITORY_PATH)
-String repositoryPath ) {
+@Inject(FileUploadConstants.SIZE_THRESHOLD) String sizeThreshold,
+@Inject(FileUploadConstants.FILE_REPOSITORY_PATH) String
repositoryPath ) {
int threshold ;
try {
threshold = Integer.parseInt(sizeThreshold);
}
catch (NumberFormatException nfe) {
-// how hard is it to specify a valid integer?
-}
-finally {
threshold = 256; // I guess this is a magic number
}
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java?rev=783009&r1=783008&r2=783009&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
Tue Jun 9 14:13:34 2009
@@ -54,7 +54,7 @@
static final Logger LOG = LoggerFactory.getLogger(MultiPartRequest.class);
protected ProgressListener progressListener;
-protected FileItemFactory fileItemFactory;
+protected FileItemFactoryWrapper fileItemFactoryWrapper;
protected boolean portletUpload;
/**
@@ -68,11 +68,11 @@
/**
*
- * @param fileItemFactory
+ * @param fileItemFactoryWrapper
*/
@Inject(FileUploadConstants.FILE_ITEM_FACTORY)
-public void setFileItemFactory(FileItemFactory fileItemFactory) {
-this.fileItemFactory = fileItemFactory;
+public void setFileItemFactory(FileItemFactoryWrapper
fileItemFactoryWrapper) {
+this.fileItemFactoryWrapper = fileItemFactoryWrapper;
}
/**
@@ -96,10 +96,10 @@
FileUpload upload ;
if (portletUpload) {
-upload = new PortletFileUpload(fileItemFactory);
+upload = new
PortletFileUpload(fileItemFactoryWrapper.getFileItemFactory());
}
else {
-upload = new ServletFileUpload(fileItemFactory);
+upload = new
ServletFileUpload(fileItemFactoryWrapper.getFileItemFactory());
}
upload.setSizeMax(maxSize);
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-file
svn commit: r783012 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: wesw
Date: Tue Jun 9 14:15:54 2009
New Revision: 783012
URL: http://svn.apache.org/viewvc?rev=783012&view=rev
Log:
Fixed comment, removed unused import WW-3100
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.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=783012&r1=783011&r2=783012&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 Jun 9 14:15:54 2009
@@ -59,7 +59,6 @@
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.UnknownHandler;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.ConfigurationManager;
@@ -694,7 +693,7 @@
String content_type = request.getContentType();
if (content_type != null &&
content_type.indexOf("multipart/form-data") != -1) {
MultiPartRequest mpr = null;
-//add all available UnknownHandlers
+//check for alternate implementations of MultiPartRequest
Set multiNames =
getContainer().getInstanceNames(MultiPartRequest.class);
if (multiNames != null) {
for (String multiName : multiNames) {
svn commit: r783023 - in /struts/sandbox/trunk: struts2-fileupload-plugin.iml struts2-fileupload-plugin.ipr
Author: wesw Date: Tue Jun 9 15:02:44 2009 New Revision: 783023 URL: http://svn.apache.org/viewvc?rev=783023&view=rev Log: removing IDEA artifacts Removed: struts/sandbox/trunk/struts2-fileupload-plugin.iml struts/sandbox/trunk/struts2-fileupload-plugin.ipr
