[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Wink (WINK) http://cwiki.apache.org/confluence/display/WINK | |-Pages Added or Edited in This Space |-- Coding Guidelines was last edited by martins (04:32 AM). | http://cwiki.apache.org/confluence/display/WINK/Coding+Guidelines Apache Ace (ACE) http://cwiki.apache.org/confluence/display/ACE | |-Pages Added or Edited in This Space |-- Index was last edited by marrs (08:50 AM). | http://cwiki.apache.org/confluence/display/ACE/Index Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- File2 was last edited by davsclaus (11:52 PM). | http://cwiki.apache.org/confluence/display/CAMEL/File2 |-- Camel 2.0.0 Release was last edited by davsclaus (11:00 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0.0+Release |-- Idempotent Consumer was last edited by davsclaus (10:51 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Idempotent+Consumer |-- from was last edited by christian schneider (02:41 AM). | http://cwiki.apache.org/confluence/display/CAMEL/from |-- DSL Function Template was last edited by christian schneider (02:40 AM). | http://cwiki.apache.org/confluence/display/CAMEL/DSL+Function+Template |-- Camel DSL was last edited by christian schneider (02:39 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+DSL |-- convertBodyTo was last edited by christian schneider (02:38 AM). | http://cwiki.apache.org/confluence/display/CAMEL/convertBodyTo Kato (KATO) http://cwiki.apache.org/confluence/display/KATO | |-Pages Added or Edited in This Space |-- BOF4870 was created by spoole (08:00 AM). | http://cwiki.apache.org/confluence/display/KATO/BOF4870 |-- Index was last edited by spoole (07:57 AM). | http://cwiki.apache.org/confluence/display/KATO/Index Apache Geronimo v2.2 (GMOxDOC22) http://cwiki.apache.org/confluence/display/GMOxDOC22 | |-Pages Added or Edited in This Space |-- Configuring the JMS server was last edited by sophia (11:45 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Configuring+the+JMS+server |-- cxf-tools was last edited by sophia (11:13 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/cxf-tools |-- Geronimo GShell Commands was last edited by sophia (11:06 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Geronimo+GShell+Commands - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
Issues Opened: week of 2009-06-08
Struts2 - Monday, June 8, 2009 7 opened in last 7 days [WW-3146] s:doubleselect fails if form has no "name" attribute - Type: Bug - Reporter: Dave Newton - Components: [] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3146 [WW-3145] Convention plugin + portlet plugin not working together ? - Type: Improvement - Reporter: Bakann - Components: [Plugin - Convention, Plugin - Portlet] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3145 [WW-3148] ParametersInterceptor exception - Type: Temp - Reporter: Judy L - Components: [Core Interceptors] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3148 [WW-3153] xwork com.opensymphony.xwork2.config.ConfigurationManager needs better error handling for missing plugin config,class - Type: Bug - Reporter: Martin Gainty - Components: [] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3153 [WW-3147] com.opensymphony.xwork2.spring.SpringObjectFactory does'nt create bean when alwaysRespectAutowireStrategy=false - Type: Bug - Reporter: Martin Gainty - Components: [Plugin - Spring] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3147 [WW-3152] save Token - Multiple click on Button in IE - Type: Bug - Reporter: Rameshkumar P - Components: [] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3152 [WW-3144] Label tag doesn't use "key" attribute properly - Type: Bug - Reporter: Dave Newton - Components: [] - Affects Versions: [] - http://issues.apache.org/struts/browse/WW-3144
svn commit: r782726 - in /struts/sandbox/trunk/struts2-fileupload-plugin: ./ src/main/java/org/apache/struts2/fileupload/ src/main/resources/ src/test/java/org/apache/struts2/fileupload/
Author: wesw
Date: Mon Jun 8 18:55:21 2009
New Revision: 782726
URL: http://svn.apache.org/viewvc?rev=782726&view=rev
Log:
Should mostly be working now... Time to create an example app
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusAction.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusActionTest.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusHolderTest.java
Modified: struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml?rev=782726&r1=782725&r2=782726&view=diff
==
--- struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml Mon Jun 8 18:55:21
2009
@@ -28,7 +28,7 @@
struts2-plugins
2.1.7-SNAPSHOT
-struts2-fileupload-plugin
+org.apache.struts
struts2-fileupload-plugin
1.0-SNAPSHOT
Struts 2 Advanced File Upload Plugin
@@ -46,6 +46,20 @@
2.1.7-SNAPSHOT
compile
+
+
+com.thoughtworks.xstream
+xstream
+1.3.1
+
+
+
+org.codehaus.jettison
+jettison
+1.1
+
+
+
junit
junit
@@ -87,4 +101,4 @@
-
\ No newline at end of file
+
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java?rev=782726&r1=782725&r2=782726&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java
Mon Jun 8 18:55:21 2009
@@ -25,6 +25,9 @@
import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork2.inject.Inject;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Just a simple ProgressListener for Jakarta FileUpload. It will store
* file progress in a HashMap that gets cleaned out once in a while.
@@ -38,7 +41,7 @@
private int updateFrequency = 2048; // magic number for a default
private UploadStatusTracker tracker;
-private long lastUpdate = -1L; //
+private static Map lastUpdates = new
HashMap(); //
/**
*
@@ -71,14 +74,20 @@
* @param item
*/
public void update(long bytesRead, long contentLength, int item) {
-if ( bytesRead / updateFrequency > lastUpdate) {
+String sessionId =
ServletActionContext.getRequest().getSession(true).getId();
+UploadFile curKey = new UploadFile(sessionId,item);
+Long lastUpdateValue = lastUpdates.get(curKey);
+long lastUpdate = 0;
+if (lastUpdateValue != null ) {
+lastUpdate = lastUpdateValue.longValue();
+}
+if ( bytesRead / updateFrequency >= lastUpdate) {
lastUpdate = bytesRead / updateFrequency;
if (lastUpdate == 0 ) {
-// we could get stuck here if we leave it
-lastUpdate = 1L;
+lastUpdate = 1;
}
-// I wonder if this will ever NPE
-String sessionId =
ServletActionContext.getRequest().getSession(true).getId();
+lastUpdates.remove(curKey);
+lastUpdates.put(curKey, lastUpdate);
UploadStatus status = new UploadStatus();
status.setBytesRead(bytesRead);
status.setContentLength(contentLength);
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusAction.java?rev=782726&r1=782725&r2=782726&view=diff
==
