[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- Index was last edited by drwoods (12:41 PM). | http://cwiki.apache.org/confluence/display/openjpa/Index |-- OpenJPA 2.0 Milestone 2 distribution is available was created by techhusky (12:32 PM). | http://cwiki.apache.org/confluence/display/openjpa/2009/06/03/OpenJPA+2.0+Milestone+2+distribution+is+available |-- Entity Enhancement was last edited by curti...@gmail.com (12:08 PM). | http://cwiki.apache.org/confluence/display/openjpa/Entity+Enhancement |-- OpenJPA 2.0 iteration 7 is complete was created by techhusky (08:24 AM). | http://cwiki.apache.org/confluence/display/openjpa/2009/06/03/OpenJPA+2.0+iteration+7+is+complete |-- JPA 2.0 Roadmap was last edited by techhusky (07:55 AM). | http://cwiki.apache.org/confluence/display/openjpa/JPA+2.0+Roadmap |-- OpenJPA 2.0.0 Early Access 2 was last edited by drwoods (05:56 AM). | http://cwiki.apache.org/confluence/display/openjpa/OpenJPA+2.0.0+Early+Access+2 Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- JSON was last edited by davsclaus (11:51 PM). | http://cwiki.apache.org/confluence/display/CAMEL/JSON |-- Camel 2.0.0 Release was last edited by davsclaus (11:49 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0.0+Release |-- Camel 2.0 Design was last edited by davsclaus (09:49 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0+Design |-- Mail was last edited by davsclaus (09:46 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Mail |-- GSoC 2009 was last edited by xueqiang.mi (04:37 AM). | http://cwiki.apache.org/confluence/display/CAMEL/GSoC+2009 Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/ROLLER/Developers+Resources (1) Apache Sling Website (SLINGxSITE) http://cwiki.apache.org/confluence/display/SLINGxSITE | |-Pages Added or Edited in This Space |-- Getting and Building Sling was last edited by mykee (02:07 PM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Getting+and+Building+Sling Apache ActiveMQ CPP (AMQCPP) http://cwiki.apache.org/confluence/display/AMQCPP | |-Pages Added or Edited in This Space |-- ActiveMQ-CPP 3.0 Release was last edited by tabish121 (02:02 PM). | http://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.0+Release Apache Geronimo v2.2 (GMOxDOC22) http://cwiki.apache.org/confluence/display/GMOxDOC22 | |-Pages Added or Edited in This Space |-- Documentation was last edited by chirun...@gmail.com (11:46 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Documentation |-- Configuring EJB Containers was last edited by chirun...@gmail.com (11:34 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Configuring+EJB+Containers |-- Adding JARs to the Geronimo repository was last edited by chirun...@gmail.com (07:33 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Adding+JARs+to+the+Geronimo+repository |-- General considerations for migrating applications from other application servers was last edited by chirun...@gmail.com (07:33 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/General+considerations+for+migrating+applications+from+other+application+servers |-- Substituting one module with another was last edited by chirun...@gmail.com (07:33 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Substituting+one+module+with+another |-- Apache Geronimo v2.2 documentation development status was last edited by chirun...@gmail.com (07:33 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Apache+Geronimo+v2.2+documentation+development+status Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- Customization was last edited by andrey (10:49 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Customization |-- Custom BatchQueryBuilder Factory was created by andrey (10:48 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Custom+BatchQueryBuilder+Factory Apache Labs (labs) http://cwiki.apache.org/confluence/display/labs | |-Pages Added or Edited in This Space |-- CloudsMapReduce was last edited by robert burrell donkin (11:23 PM). | http://cwiki.apache.org/confluence/display/labs/CloudsMapReduce OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB | |-Pages Added or Edited in This Space |-- Download was last edited by dblevins (06:22 PM). | http://cwiki.apache.
svn commit: r781731 - /struts/sandbox/trunk/struts2-fileupload-plugin/
Author: wesw Date: Thu Jun 4 13:27:44 2009 New Revision: 781731 URL: http://svn.apache.org/viewvc?rev=781731&view=rev Log: fixing svn properties Modified: struts/sandbox/trunk/struts2-fileupload-plugin/ (props changed) Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/ -- --- svn:ignore (added) +++ svn:ignore Thu Jun 4 13:27:44 2009 @@ -0,0 +1,2 @@ +struts2-fileupload-plugin.* +target
svn commit: r781734 - /struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
Author: wesw Date: Thu Jun 4 13:43:17 2009 New Revision: 781734 URL: http://svn.apache.org/viewvc?rev=781734&view=rev Log: first cut Added: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml Added: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml?rev=781734&view=auto == --- struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml (added) +++ struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml Thu Jun 4 13:43:17 2009 @@ -0,0 +1,47 @@ + + + +http://struts.apache.org/dtds/struts-2.1.7.dtd";> + + + + + + + + + + + + + + + + \ No newline at end of file
svn commit: r781737 - in /struts/sandbox/trunk/struts2-fileupload-plugin/src/main: java/org/apache/struts2/fileupload/FileUploadConstants.java resources/struts-plugin.xml
Author: wesw Date: Thu Jun 4 13:49:07 2009 New Revision: 781737 URL: http://svn.apache.org/viewvc?rev=781737&view=rev Log: fixing svn properties Modified: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml Modified: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java?rev=781737&r1=781736&r2=781737&view=diff == --- struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java (original) +++ struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java Thu Jun 4 13:49:07 2009 @@ -60,6 +60,6 @@ /** * */ -public static final String TIME_TO_KEEP_STATUS = "struts.fileupload.timetokeepstatus"; +public static final String TIME_TO_KEEP_STATUS = "struts.fileuploadplugin.timetokeepstatus"; } Modified: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml?rev=781737&r1=781736&r2=781737&view=diff == --- struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml (original) +++ struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml Thu Jun 4 13:49:07 2009 @@ -43,5 +43,5 @@ - + \ No newline at end of file
svn commit: r781738 - 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: Thu Jun 4 13:51:05 2009 New Revision: 781738 URL: http://svn.apache.org/viewvc?rev=781738&view=rev Log: updating properties for keywords, etc. Modified: struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileItemFactoryWrapper.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatus.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusHolderTest.java (props changed) struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusTest.java (props changed) Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/BasicProgressListener.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileItemFactoryWrapper.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatus.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusHolderTest.java -- svn:keywords = Id Rev Author Date URL Propchange: struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusTest.java -- svn:keywords = Id Rev Author Date URL
svn commit: r781750 - in /struts/sandbox/trunk/struts2-fileupload-plugin/src: main/java/org/apache/struts2/fileupload/ main/resources/ test/java/org/apache/struts2/fileupload/
Author: wesw
Date: Thu Jun 4 14:24:28 2009
New Revision: 781750
URL: http://svn.apache.org/viewvc?rev=781750&view=rev
Log:
minor refactoring, improved UploadStatus & UploadStatusHolder after realizing
that I should also be keying off of the item # passed in on the
update(long,long,int) method of ProgressListener
Added:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadFile.java
(with props)
Modified:
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/UploadStatus.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/UploadStatusHolderTest.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusTest.java
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=781750&r1=781749&r2=781750&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
Thu Jun 4 14:24:28 2009
@@ -73,7 +73,7 @@
UploadStatus status = new UploadStatus();
status.setBytesRead(bytesRead);
status.setContentLength(contentLength);
-status.setItem(item);
+status.setItemId(item);
holder.addUploadStatus(sessionId, status);
}
}
Added:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadFile.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadFile.java?rev=781750&view=auto
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadFile.java
(added)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadFile.java
Thu Jun 4 14:24:28 2009
@@ -0,0 +1,114 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.fileupload;
+
+/**
+ * This class just holds the identifying fields for a file
+ * that is in the process of being uploaded.
+ *
+ * @author $Author$
+ *
+ */
+public class UploadFile {
+
+private String sessionId;
+private int fileItemId;
+
+/**
+ *
+ * @param sessionId
+ * @param fileItemId
+ */
+public UploadFile(String sessionId, int fileItemId) {
+this.sessionId = sessionId;
+this.fileItemId = fileItemId;
+}
+
+/**
+ *
+ * @return
+ */
+public String getSessionId() {
+return sessionId;
+}
+
+/**
+ *
+ * @param sessionId
+ */
+public void setSessionId(String sessionId) {
+this.sessionId = sessionId;
+}
+
+/**
+ *
+ * @return
+ */
+public int getFileItemId() {
+return fileItemId;
+}
+
+/**
+ *
+ * @param fileItemId
+ */
+public void setFileItemId(int fileItemId) {
+this.fileItemId = fileItemId;
+}
+
+/**
+ *
+ * @param o
+ * @return
+ */
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (!(o instanceof UploadFile)) return false;
+
+Upl
svn commit: r781766 - in /struts/sandbox/trunk/struts2-fileupload-plugin/src: main/java/org/apache/struts2/fileupload/ main/resources/ test/java/org/apache/struts2/fileupload/
Author: wesw
Date: Thu Jun 4 15:04:48 2009
New Revision: 781766
URL: http://svn.apache.org/viewvc?rev=781766&view=rev
Log:
moving the tracking to a service to allow users to replace
Added:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusTracker.java
Modified:
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/FileUploadConstants.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/UploadStatusHolderTest.java
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=781766&r1=781765&r2=781766&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
Thu Jun 4 15:04:48 2009
@@ -37,10 +37,19 @@
public class BasicProgressListener implements ProgressListener {
private int updateFrequency = 2048; // magic number for a default
-private UploadStatusHolder holder = new UploadStatusHolder();
+private UploadStatusTracker tracker;
private long lastUpdate = -1L; //
/**
+ *
+ * @param tracker
+ */
+@Inject(FileUploadConstants.UPLOAD_STATUS_HOLDER)
+public void setTracker(UploadStatusTracker tracker) {
+this.tracker = tracker;
+}
+
+/**
*
* @param updateFrequency
*/
@@ -74,7 +83,7 @@
status.setBytesRead(bytesRead);
status.setContentLength(contentLength);
status.setItemId(item);
-holder.addUploadStatus(sessionId, status);
+tracker.addUploadStatus(sessionId, status);
}
}
}
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java?rev=781766&r1=781765&r2=781766&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/FileUploadConstants.java
Thu Jun 4 15:04:48 2009
@@ -62,4 +62,9 @@
*/
public static final String TIME_TO_KEEP_STATUS =
"struts.fileuploadplugin.timetokeepstatus";
+/**
+ *
+ */
+public static final String UPLOAD_STATUS_HOLDER =
"struts.fileuploadplugin.holder";
+
}
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java?rev=781766&r1=781765&r2=781766&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusHolder.java
Thu Jun 4 15:04:48 2009
@@ -35,7 +35,7 @@
*
* @author Wes W
*/
-public class UploadStatusHolder {
+public class UploadStatusHolder implements UploadStatusTracker {
private int secondsToKeep = 600 ; //default to ten minutes
public static Map statuses = new
HashMap();
Added:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusTracker.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusTracker.java?rev=781766&view=auto
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusTracker.java
(added)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src
svn commit: r781782 - /struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java
Author: wesw
Date: Thu Jun 4 15:46:32 2009
New Revision: 781782
URL: http://svn.apache.org/viewvc?rev=781782&view=rev
Log:
making sure trackings of multiple files are separate and working
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java?rev=781782&r1=781781&r2=781782&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/BasicProgressListenerTest.java
Thu Jun 4 15:46:32 2009
@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
import java.util.HashMap;
+import java.util.List;
/**
* Unit test for BasicProgressListener
@@ -54,6 +55,13 @@
*/
@Before
public void setUp() {
+// the basic progress listener keys off of the session id
+// and the file item id. To find the session id, it will
+// try to get a session from the servletActionContext
+// so, we setup a mock context to let it work. I'm not sure
+// if all of the following is necessary, but it appears to
+// work and ids are properly generating as of $Date$
+
Map extraContext = new HashMap();
servletContext = new MockServletContext();
@@ -83,7 +91,7 @@
UploadStatusTracker tracker2 = new UploadStatusHolder();
String key = request.getSession().getId();
-System.err.println("key - " + key);
+// System.err.println("key - " + key);
UploadStatus status = tracker2.getUploadStatus(key , 1);
@@ -107,7 +115,31 @@
UploadStatusTracker tracker2 = new UploadStatusHolder();
String key = request.getSession().getId();
-System.err.println("key - " + key);
+// System.err.println("key - " + key);
+
+UploadStatus status = tracker2.getUploadStatus(key, 1 );
+
+assertTrue(status.getBytesRead() == 10L);
+assertTrue(status.getContentLength() == 10L);
+assertTrue(status.getItemId() == 1);
+
+}
+
+/**
+ *
+ */
+@Test
+public void testMultipleFileUploadProgress() {
+BasicProgressListener listener = new BasicProgressListener();
+UploadStatusTracker tracker = new UploadStatusHolder();
+listener.setTracker(tracker);
+listener.setUpdateFrequency("10");
+listener.update(10L, 10L, 1);
+listener.update(100L, 100L, 2);
+
+UploadStatusTracker tracker2 = new UploadStatusHolder();
+String key = request.getSession().getId();
+// System.err.println("key - " + key);
UploadStatus status = tracker2.getUploadStatus(key, 1 );
@@ -115,5 +147,14 @@
assertTrue(status.getContentLength() == 10L);
assertTrue(status.getItemId() == 1);
+UploadStatus status2 = tracker2.getUploadStatus(key, 2 );
+
+assertTrue(status2.getBytesRead() == 100L);
+assertTrue(status2.getContentLength() == 100L);
+assertTrue(status2.getItemId() == 2);
+
+List bothStatuses =
tracker2.getAllStatusesInSession(key);
+assertTrue(bothStatuses.size() == 2) ;
+
}
}
\ No newline at end of file
svn commit: r781798 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/util/TokenHelper.java test/java/org/apache/struts2/util/TokenHelperTest.java
Author: wesw
Date: Thu Jun 4 17:08:35 2009
New Revision: 781798
URL: http://svn.apache.org/viewvc?rev=781798&view=rev
Log:
Fixing NPE in token processing WW-3150, thanks James Peltzer
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java?rev=781798&r1=781797&r2=781798&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
Thu Jun 4 17:08:35 2009
@@ -97,6 +97,9 @@
* @return the token String or null, if the token could not be found
*/
public static String getToken(String tokenName) {
+if (tokenName == null ) {
+return null;
+}
Map params = ActionContext.getContext().getParameters();
String[] tokens = (String[]) params.get(tokenName);
String token;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java?rev=781798&r1=781797&r2=781798&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
Thu Jun 4 17:08:35 2009
@@ -58,6 +58,11 @@
assertTrue(TokenHelper.validToken());
}
+public void testGetTokenDoesNotNpe() {
+String token = TokenHelper.getToken(null);
+assertTrue(token == null);
+}
+
protected void setUp() throws Exception {
session = new HashMap();
Map params = new HashMap();
svn commit: r781805 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
Author: wesw
Date: Thu Jun 4 17:33:00 2009
New Revision: 781805
URL: http://svn.apache.org/viewvc?rev=781805&view=rev
Log:
making unit test match environment that caused NPE in WW-3150
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java?rev=781805&r1=781804&r2=781805&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
Thu Jun 4 17:33:00 2009
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
import junit.framework.TestCase;
@@ -61,12 +62,15 @@
public void testGetTokenDoesNotNpe() {
String token = TokenHelper.getToken(null);
assertTrue(token == null);
+
+String token2 = TokenHelper.getToken("");
+assertTrue(token2 == null);
}
protected void setUp() throws Exception {
session = new HashMap();
-Map params = new HashMap();
-Map ctxMap = new HashMap();
+Map params = new TreeMap();
+Map ctxMap = new TreeMap();
ctxMap.put(ActionContext.SESSION, session);
ctxMap.put(ActionContext.PARAMETERS, params);
ActionContext ctx = new ActionContext(ctxMap);
svn commit: r781828 - in /struts/sandbox/trunk/struts2-fileupload-plugin/src: main/java/org/apache/struts2/fileupload/UploadStatusAction.java main/resources/struts-plugin.xml test/java/org/apache/stru
Author: wesw
Date: Thu Jun 4 18:42:41 2009
New Revision: 781828
URL: http://svn.apache.org/viewvc?rev=781828&view=rev
Log:
added an action, it's configuration and unit test
the action is a shim for getting the status of currently running uploads
Added:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusAction.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusActionTest.java
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
Added:
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=781828&view=auto
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusAction.java
(added)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/UploadStatusAction.java
Thu Jun 4 18:42:41 2009
@@ -0,0 +1,43 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.fileupload;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+import java.util.List;
+
+import org.apache.struts2.ServletActionContext;
+
+/**
+ * Class that provides the ability to retrieve the
+ * status of the session's running uploads.
+ *
+ * @author $Author$
+ *
+ */
+public class UploadStatusAction extends ActionSupport {
+
+public List getUploadStatus() {
+UploadStatusHolder holder = new UploadStatusHolder();
+return holder.getAllStatusesInSession(
+ServletActionContext.getRequest().getSession(true).getId() );
+}
+}
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml?rev=781828&r1=781827&r2=781828&view=diff
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
Thu Jun 4 18:42:41 2009
@@ -46,5 +46,12 @@
-
+
+
+
+
+uploadStatus
+
+
+
\ No newline at end of file
Added:
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusActionTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusActionTest.java?rev=781828&view=auto
==
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusActionTest.java
(added)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/test/java/org/apache/struts2/fileupload/UploadStatusActionTest.java
Thu Jun 4 18:42:41 2009
@@ -0,0 +1,90 @@
+package org.apache.struts2.fileupload;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsStatics;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+import com.opensymphony.xwork2.ActionContext;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Describe your class here
+ *
+ * @author Your Name
+ *
+ * $Id$
+ */
+public class UploadStatusActionTest implements StrutsStatics {
+
+ActionContext actionContext;
+
+private MockServletContext servletContext;
+private HttpSer
svn commit: r781838 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/interceptor/ test/java/org/apache/struts2/interceptor/
Author: wesw
Date: Thu Jun 4 19:38:07 2009
New Revision: 781838
URL: http://svn.apache.org/viewvc?rev=781838&view=rev
Log:
More NPE possible in TokenSessionStoreInterceptor, updated unit tests again
WW-3150
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java?rev=781838&r1=781837&r2=781838&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
Thu Jun 4 19:38:07 2009
@@ -116,11 +116,11 @@
String tokenName = TokenHelper.getTokenName();
String token = TokenHelper.getToken(tokenName);
-Map params = ac.getParameters();
-params.remove(tokenName);
-params.remove(TokenHelper.TOKEN_NAME_FIELD);
-
if ((tokenName != null) && (token != null)) {
+Map params = ac.getParameters();
+params.remove(tokenName);
+params.remove(TokenHelper.TOKEN_NAME_FIELD);
+
ActionInvocation savedInvocation =
InvocationSessionStore.loadInvocation(tokenName, token);
if (savedInvocation != null) {
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java?rev=781838&r1=781837&r2=781838&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
Thu Jun 4 19:38:07 2009
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -110,9 +111,9 @@
protected void setUp() throws Exception {
loadConfigurationProviders(new TestConfigurationProvider());
-session = new HashMap();
-params = new HashMap();
-extraContext = new HashMap();
+session = new TreeMap();
+params = new TreeMap();
+extraContext = new TreeMap();
extraContext.put(ActionContext.SESSION, session);
extraContext.put(ActionContext.PARAMETERS, params);
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java?rev=781838&r1=781837&r2=781838&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
Thu Jun 4 19:38:07 2009
@@ -44,6 +44,12 @@
assertEquals(Action.SUCCESS, proxy2.execute());
}
+public void testNullTokenName() throws Exception {
+ActionProxy proxy = buildProxy(getActionName());
+setToken((String)null);
+proxy.execute();
+}
+
protected String getActionName() {
return TestConfigurationProvider.TOKEN_SESSION_ACTION_NAME;
}
svn commit: r781886 - in /struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor: DummyDefaultOValValidationManager aa.java
Author: musachy Date: Fri Jun 5 02:05:35 2009 New Revision: 781886 URL: http://svn.apache.org/viewvc?rev=781886&view=rev Log: rname file(did my cat walk on the keyboard?) Added: struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/DummyDefaultOValValidationManager - copied unchanged from r781885, struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/aa.java Removed: struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/aa.java
svn commit: r781887 - in /struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor: DummyDefaultOValValidationManager DummyDefaultOValValidationManager.java
Author: musachy Date: Fri Jun 5 02:06:13 2009 New Revision: 781887 URL: http://svn.apache.org/viewvc?rev=781887&view=rev Log: rname file(agrrr) Added: struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/DummyDefaultOValValidationManager.java - copied unchanged from r781886, struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/DummyDefaultOValValidationManager Removed: struts/struts2/trunk/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/DummyDefaultOValValidationManager
