[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Camel JMX was last edited by wtam (10:47 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+JMX |-- CXF was last edited by njiang (02:29 AM). | http://cwiki.apache.org/confluence/display/CAMEL/CXF |-- Stream was last edited by davsclaus (01:11 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Stream Apache CXF Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- JMS Transport was last edited by dstanley (07:06 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/JMS+Transport Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Navigation was last edited by elecharny (08:29 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Navigation Apache JSecurity (JSEC) http://cwiki.apache.org/confluence/display/JSEC | |-Pages Added or Edited in This Space |-- Mailing Lists was last edited by lhazlewood (09:49 AM). | http://cwiki.apache.org/confluence/display/JSEC/Mailing+Lists Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Release Eclipse Plugin Process was last edited by mcconne (08:50 PM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Release+Eclipse+Plugin+Process Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- Comparing DataObjects was created by ari (01:57 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Comparing+DataObjects |-- DataObjects was last edited by ari (01:44 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/DataObjects |-- Configuring Caching Behavior was last edited by ari (01:41 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Configuring+Caching+Behavior |-- Caching and Fresh Data was last edited by ari (01:39 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Caching+and+Fresh+Data Apache Directory Server v1.0 (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- Navigation was last edited by elecharny (08:31 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Navigation Apache Geronimo v2.1 (GMOxDOC21) http://cwiki.apache.org/confluence/display/GMOxDOC21 | |-Pages Added or Edited in This Space |-- Tutorials was last edited by hcunico (07:15 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Tutorials |-- persistence.xml was last edited by phanibalaji (02:55 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/persistence.xml Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Wicket Component JAR Metadata was created by jonathanlocke (12:35 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+Component+JAR+Metadata |-- Sites using Wicket was last edited by weliwarmer (01:31 AM). | http://cwiki.apache.org/confluence/display/WICKET/Sites+using+Wicket |-- Index was last edited by jonathanlocke (12:22 AM). | http://cwiki.apache.org/confluence/display/WICKET/Index Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Presentations was last edited by [EMAIL PROTECTED] (01:32 PM). | http://cwiki.apache.org/confluence/display/FELIX/Presentations |-- Service Requirement Handler was last edited by clement.escoffier (01:55 AM). | http://cwiki.apache.org/confluence/display/FELIX/Service+Requirement+Handler Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- Qpid Java Meeting Minutes 2008-06-20 was created by godfrer (06:10 AM). | http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Meeting+Minutes+2008-06-20 |-- Developer Pages was last edited by godfrer (06:09 AM). | http://cwiki.apache.org/confluence/display/qpid/Developer+Pages Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Website Feedback was created by haleh (03:58 PM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Website+Feedback |-- Security Aware Programming in Tuscany was last edited by haleh (03:20 PM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Security+Aware+Programming+in+Tuscany Apache CXF (CXF) http://cwiki.apache.org/confluence/display/CXF | |-Pages Add
svn commit: r670170 - in /struts/struts2/trunk: apps/blank/src/test/java/example/ core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/dispatcher/ core/src/main/java
Author: hermanns
Date: Sat Jun 21 02:40:34 2008
New Revision: 670170
URL: http://svn.apache.org/viewvc?rev=670170&view=rev
Log:
WW-2537 Fix generics in all codebase
Starting with Java5 enhancements in S2.
This patch applies required changes to S2 related to the "generified xwork"
XWork Java5 enhancements
o added generics where possible
o use parameterizes Collection classes where possible
o converted for to for-each loops
o optimized imports
o updated tests
o aligned parameter types with Struts2
o fixed some minor bugs
Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/textarea.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
Modified: struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java?rev=670170&r1=670169&r2=670170&view=diff
==
--- struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java Sat
Jun 21 02:40:34 2008
@@ -44,7 +44,7 @@
ActionSupport.INPUT.equals(result));
}
-protected Map assertFieldErrors(ActionSupport action) throws Exception {
+protected Map> assertFieldErrors(ActionSupport
action) throws Exception {
assertTrue(action.hasFieldErrors());
return action.getFieldErrors();
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=670170&r1=670169&r2=670170&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Sat Jun 21 02:40:34 2008
@@ -191,7 +191,7 @@
Map application = ctx.getApplication();
Dispatcher du = Dispatcher.getInstance();
-Map extraContext = du.createContextMap(new RequestMap(req),
+Map extraContext = du.createContextMap(new
RequestMap(req),
newParams,
session,
application,
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java?rev=670170&r1=670169&r2=670170&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
Sat Jun 21 02:40:34 2008
@@ -87,7 +87,7 @@
"or partial depending on param tag nested)if they exists")
public class FieldError extends UIBean implements UnnamedParametric {
-private List errorFieldNames = new ArrayList();
+private List errorFieldNames = new ArrayList();
public FieldError(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
supe
svn commit: r670172 - /struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Author: hermanns Date: Sat Jun 21 03:12:56 2008 New Revision: 670172 URL: http://svn.apache.org/viewvc?rev=670172&view=rev Log: WW-2637 add timezone support to Jasper Reports Plugin Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?rev=670172&r1=670171&r2=670172&view=diff == --- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java (original) +++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java Sat Jun 21 03:12:56 2008 @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -61,68 +62,68 @@ /** * - * + * * Generates a JasperReports report using the specified format or PDF if no * format is specified. - * + * * * * This result type takes the following parameters: - * + * * - * + * * - * + * * location (default) - the location where the compiled jasper report * definition is (foo.jasper), relative from current URL. - * + * * dataSource (required) - the EL expression used to retrieve the * datasource from the value stack (usually a List). - * + * * parse - true by default. If set to false, the location param will * not be parsed for EL expressions. - * + * * format - the format in which the report should be generated. Valid * values can be found in [EMAIL PROTECTED] JasperReportConstants}. If no format is * specified, PDF will be used. - * + * * contentDisposition - disposition (defaults to "inline", values are * typically filename="document.pdf"). - * + * * documentName - name of the document (will generate the http header * Content-disposition = X; filename=X.[format]). - * + * * delimiter - the delimiter used when generating CSV reports. By * default, the character used is ",". - * + * * imageServletUrl - name of the url that, when prefixed with the * context page, can return report images. - * + * * - * reportParameters - (2.1.2+) OGNL expression used to retrieve a map of - * report parameters from the value stack. The parameters may be accessed - * in the report via the usual JR mechanism and might include data not - * part of the dataSource, such as the user name of the report creator, etc. + * reportParameters - (2.1.2+) OGNL expression used to retrieve a map of + * report parameters from the value stack. The parameters may be accessed + * in the report via the usual JR mechanism and might include data not + * part of the dataSource, such as the user name of the report creator, etc. * - * + * * - * exportParameters - (2.1.2+) OGNL expression used to retrieve a map of - * JR exporter parameters from the value stack. The export parameters are - * used to customize the JR export. For example, a PDF export might enable - * encryption and set the user password to a string known to the report creator. - * - * + * exportParameters - (2.1.2+) OGNL expression used to retrieve a map of + * JR exporter parameters from the value stack. The export parameters are + * used to customize the JR export. For example, a PDF export might enable + * encryption and set the user password to a string known to the report creator. + * + * * - * + * * - * This result follows the same rules from [EMAIL PROTECTED] StrutsResultSupport}. - * Specifically, all parameters will be parsed if the "parse" parameter - * is not set to false. + * This result follows the same rules from [EMAIL PROTECTED] StrutsResultSupport}. + * Specifically, all parameters will be parsed if the "parse" parameter + * is not set to false. * * - * + * * Example: - * + * * ** foo.jasper @@ -137,7 +138,6 @@ * mySource * * - * */ public class JasperReportsResult extends StrutsResultSupport implements JasperReportConstants { @@ -151,13 +151,14 @@ protected String contentDisposition; protected String delimiter; protected String imageServletUrl = "/images/"; - +protected String timeZone; + /** - * Names a report parameters map stack value, allowing - * additional report parameters from the action. + * Names a report parameters map stack value, allowing + * additional report parameters from the action. */ pro
svn commit: r670173 - /struts/struts2/trunk/plugins/jasperreports/pom.xml
Author: hermanns Date: Sat Jun 21 03:14:50 2008 New Revision: 670173 URL: http://svn.apache.org/viewvc?rev=670173&view=rev Log: WW-2687 Upgrade JasperReports dependancy to 3.0.0 Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?rev=670173&r1=670172&r2=670173&view=diff == --- struts/struts2/trunk/plugins/jasperreports/pom.xml (original) +++ struts/struts2/trunk/plugins/jasperreports/pom.xml Sat Jun 21 03:14:50 2008 @@ -43,7 +43,7 @@ jasperreports jasperreports -1.2.1 +3.0.0 provided
svn commit: r670174 - in /struts/struts2/trunk/core/src/test: java/org/apache/struts2/views/jsp/ui/RadioTest.java resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
Author: mrdon
Date: Sat Jun 21 03:16:19 2008
New Revision: 670174
URL: http://svn.apache.org/viewvc?rev=670174&view=rev
Log:
Fixing test that breaks in Java 6 WW-2537
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=670174&r1=670173&r2=670174&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Sat Jun 21 03:16:19 2008
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.TreeMap;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
@@ -124,14 +125,14 @@
}
public void testSimpleWithStringMap() throws Exception {
-final Map myMap = new HashMap();
+final Map myMap = new TreeMap();
myMap.put("name", "Std.");
stack.push(new HashMap() {{ put ("myMap", myMap); }});
RadioTag tag = new RadioTag();
tag.setPageContext(pageContext);
tag.setName("myMap['name']");
-tag.setList("[EMAIL PROTECTED]@{\"Opt.\":\"Opt.\", \"Std.\":\"Std.\",
\"\":\"N/A\"}");
+tag.setList("[EMAIL PROTECTED]@{\"Opt.\":\"Opt.\", \"Std.\":\"Std.\",
\"\":\"N/A\"}");
tag.doStartTag();
tag.doEndTag();
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt?rev=670174&r1=670173&r2=670174&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt
Sat Jun 21 03:16:19 2008
@@ -1,11 +1,11 @@
-
-Std.
-
-Opt.
N/A
+
+Opt.
+
+Std.
svn commit: r670181 - in /struts/sandbox/trunk/struts2-jst-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts2/ src/main/java/org/apa
Author: mrdon Date: Sat Jun 21 03:50:43 2008 New Revision: 670181 URL: http://svn.apache.org/viewvc?rev=670181&view=rev Log: Adding new Struts 2 JST Plugin that renders pages using Trimpath's JST Added: struts/sandbox/trunk/struts2-jst-plugin/ struts/sandbox/trunk/struts2-jst-plugin/LICENSE.txt struts/sandbox/trunk/struts2-jst-plugin/NOTICE.txt struts/sandbox/trunk/struts2-jst-plugin/README.txt struts/sandbox/trunk/struts2-jst-plugin/pom.xml struts/sandbox/trunk/struts2-jst-plugin/src/ struts/sandbox/trunk/struts2-jst-plugin/src/main/ struts/sandbox/trunk/struts2-jst-plugin/src/main/java/ struts/sandbox/trunk/struts2-jst-plugin/src/main/java/org/ struts/sandbox/trunk/struts2-jst-plugin/src/main/java/org/apache/ struts/sandbox/trunk/struts2-jst-plugin/src/main/java/org/apache/struts2/ struts/sandbox/trunk/struts2-jst-plugin/src/main/java/org/apache/struts2/jst/ struts/sandbox/trunk/struts2-jst-plugin/src/main/java/org/apache/struts2/jst/JSTResult.java struts/sandbox/trunk/struts2-jst-plugin/src/main/resources/ struts/sandbox/trunk/struts2-jst-plugin/src/main/resources/struts-plugin.xml struts/sandbox/trunk/struts2-jst-plugin/src/main/resources/trimpath-template-1.0.38.js struts/sandbox/trunk/struts2-jst-plugin/src/test/ struts/sandbox/trunk/struts2-jst-plugin/src/test/java/ struts/sandbox/trunk/struts2-jst-plugin/src/test/java/org/ struts/sandbox/trunk/struts2-jst-plugin/src/test/java/org/apache/ struts/sandbox/trunk/struts2-jst-plugin/src/test/java/org/apache/struts2/ struts/sandbox/trunk/struts2-jst-plugin/src/test/java/org/apache/struts2/jst/ struts/sandbox/trunk/struts2-jst-plugin/src/test/java/org/apache/struts2/jst/JSTResultTest.java struts/sandbox/trunk/struts2-jst-plugin/src/test/resources/ struts/sandbox/trunk/struts2-jst-plugin/src/test/resources/hello-name.js struts/sandbox/trunk/struts2-jst-plugin/src/test/resources/hello.js Added: struts/sandbox/trunk/struts2-jst-plugin/LICENSE.txt URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jst-plugin/LICENSE.txt?rev=670181&view=auto == --- struts/sandbox/trunk/struts2-jst-plugin/LICENSE.txt (added) +++ struts/sandbox/trunk/struts2-jst-plugin/LICENSE.txt Sat Jun 21 03:50:43 2008 @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + su
svn commit: r670182 - /struts/sandbox/trunk/struts2-jst-plugin/pom.xml
Author: mrdon Date: Sat Jun 21 03:57:23 2008 New Revision: 670182 URL: http://svn.apache.org/viewvc?rev=670182&view=rev Log: Changing version to a deployed, timestamped snapshot Modified: struts/sandbox/trunk/struts2-jst-plugin/pom.xml Modified: struts/sandbox/trunk/struts2-jst-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jst-plugin/pom.xml?rev=670182&r1=670181&r2=670182&view=diff == --- struts/sandbox/trunk/struts2-jst-plugin/pom.xml (original) +++ struts/sandbox/trunk/struts2-jst-plugin/pom.xml Sat Jun 21 03:57:23 2008 @@ -26,7 +26,7 @@ org.apache.commons commons-js2j -0.1-SNAPSHOT +0.1-20080621.105530-1 javax.servlet
svn commit: r670193 - in /struts/struts2/trunk/plugins/portlet/src: main/java/org/apache/struts2/portlet/result/ test/java/org/apache/struts2/portlet/result/
Author: hermanns
Date: Sat Jun 21 06:01:53 2008
New Revision: 670193
URL: http://svn.apache.org/viewvc?rev=670193&view=rev
Log:
WW-2678 portlet dispatching after action phase renders in wrong namespace
o applied slightly modified patch submitted by Herbert Poul
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=670193&r1=670192&r2=670193&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
Sat Jun 21 06:01:53 2008
@@ -140,7 +140,12 @@
res.setRenderParameter(ACTION_PARAM, finalLocation);
} else {
// View is rendered outside an action...uh oh...
- res.setRenderParameter(ACTION_PARAM, "renderDirect");
+String namespace = invocation.getProxy().getNamespace();
+if ( namespace != null && namespace.length() > 0 &&
!namespace.endsWith("/")) {
+namespace += namespace + "/";
+
+}
+res.setRenderParameter(ACTION_PARAM, namespace + "renderDirect");
sessionMap.put(RENDER_DIRECT_LOCATION, finalLocation);
}
if(portletMode != null) {
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?rev=670193&r1=670192&r2=670193&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
Sat Jun 21 06:01:53 2008
@@ -136,8 +136,12 @@
ActionInvocation invocation) {
ActionResponse res = PortletActionContext.getActionResponse();
// View is rendered outside an action...uh oh...
-res.setRenderParameter(PortletActionConstants.ACTION_PARAM,
-"freemarkerDirect");
+String namespace = invocation.getProxy().getNamespace();
+if ( namespace != null && namespace.length() > 0 &&
!namespace.endsWith("/")) {
+namespace += namespace + "/";
+
+}
+res.setRenderParameter(PortletActionConstants.ACTION_PARAM, namespace
+ "freemarkerDirect");
res.setRenderParameter("location", location);
res.setRenderParameter(PortletActionConstants.MODE_PARAM,
PortletActionContext
.getRequest().getPortletMode().toString());
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java?rev=670193&r1=670192&r2=670193&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
Sat Jun 21 06:01:53 2008
@@ -44,6 +44,9 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.mock.MockActionProxy;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
/**
* PortletResultTest. Insert description.
@@ -139,12 +142,16 @@
public void testDoExecute_event_locationIsJsp() {
Mock mockRequest = mock(ActionRequest.class);
Mock mockResponse = mock(ActionResponse.class);
+Mock mockProxy = mock(ActionProxy.class);
Constraint[] params = new
Constraint[]{eq(PortletActionConstants.ACTION_PARAM), eq("renderDirect")};
mockResponse.expects(once()).method("setRenderParameter").with(params);
params = new Constraint[]{eq(PortletActionConstants.MODE_PARAM),
eq(PortletMode.VIEW.toString())};
mockRespon
svn commit: r670196 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Author: hermanns
Date: Sat Jun 21 06:34:53 2008
New Revision: 670196
URL: http://svn.apache.org/viewvc?rev=670196&view=rev
Log:
WW-2240 FileUploadInterceptor causes null pointer exception
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java?rev=670196&r1=670195&r2=670196&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Sat Jun 21 06:34:53 2008
@@ -219,7 +219,7 @@
if (!(request instanceof MultiPartRequestWrapper)) {
if (LOG.isDebugEnabled()) {
ActionProxy proxy = invocation.getProxy();
-LOG.debug(getTextMessage("struts.messages.bypass.request", new
Object[]{proxy.getNamespace(), proxy.getActionName()},
ActionContext.getContext().getLocale()));
+LOG.debug(getTextMessage("struts.messages.bypass.request", new
Object[]{proxy.getNamespace(), proxy.getActionName()}, ac.getLocale()));
}
return invocation.invoke();
@@ -285,10 +285,10 @@
}
}
} else {
-LOG.error(getTextMessage(action,
"struts.messages.invalid.file", new Object[]{inputName},
ActionContext.getContext().getLocale()));
+LOG.error(getTextMessage(action,
"struts.messages.invalid.file", new Object[]{inputName}, ac.getLocale()));
}
} else {
-LOG.error(getTextMessage(action,
"struts.messages.invalid.content.type", new Object[]{inputName},
ActionContext.getContext().getLocale()));
+LOG.error(getTextMessage(action,
"struts.messages.invalid.content.type", new Object[]{inputName},
ac.getLocale()));
}
}
@@ -303,7 +303,7 @@
for (int index = 0; index < file.length; index++) {
File currentFile = file[index];
if (LOG.isInfoEnabled()) {
-LOG.info(getTextMessage(action,
"struts.messages.removing.file", new Object[]{inputValue, currentFile},
ActionContext.getContext().getLocale()));
+LOG.info(getTextMessage(action,
"struts.messages.removing.file", new Object[]{inputValue, currentFile},
ac.getLocale()));
}
if ((currentFile != null) && currentFile.isFile()) {
currentFile.delete();
svn commit: r670197 - /struts/struts2/trunk/core/src/main/resources/struts-default.xml
Author: musachy Date: Sat Jun 21 06:47:47 2008 New Revision: 670197 URL: http://svn.apache.org/viewvc?rev=670197&view=rev Log: WW-2688 Ignore parameters that start with 'struts.' Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml 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=670197&r1=670196&r2=670197&view=diff == --- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original) +++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sat Jun 21 06:47:47 2008 @@ -96,7 +96,7 @@ - + @@ -158,7 +158,9 @@ - + +dojo\..*,^struts\..* + @@ -219,7 +221,9 @@ - + +dojo\..*,^struts\..* + @@ -228,7 +232,9 @@ - + +dojo\..*,^struts\..* + input,back,cancel @@ -265,7 +271,7 @@ - dojo\..* + dojo\..*,^struts\..*
svn commit: r670200 - /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
Author: musachy
Date: Sat Jun 21 07:04:10 2008
New Revision: 670200
URL: http://svn.apache.org/viewvc?rev=670200&view=rev
Log:
WW-2669 Autocompleter options list element does not resize correctly
thanks to Aner Perez for the patch
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?rev=670200&r1=670199&r2=670200&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
Sat Jun 21 07:04:10 2008
@@ -39,7 +39,7 @@
this.formId = this.cbox.formId;
this.formFilter = this.cbox.formFilter;
this.transport = this.cbox.transport;
-
+
this.getData = function(/*String*/ url){
//show indicator
dojo.html.show(this.cbox.indicator);
@@ -58,7 +58,7 @@
if(!this.firstRequest || type == "error") {
this.cbox.notify.apply(this.cbox, [data, type, evt]);
}
-
+
this.firstRequest = false;
var arrData = null;
var dataByName = data[dojo.string.isBlank(this.cbox.dataFieldName) ?
this.cbox.name : this.cbox.dataFieldName];
@@ -84,7 +84,7 @@
arrData = data[key];
break;
} else {
- //if nathing else is found, we will use values in this
+ //if nathing else is found, we will use values in this
//object as the data
tmpArrData.push([key, data[key]]);
}
@@ -98,7 +98,7 @@
arrData = tmpArrData;
}
}
-
+
data = arrData;
}
this.setData(data);
@@ -106,7 +106,7 @@
mimetype: "text/json"
});
};
-
+
this.startSearch = function (searchStr, callback) {
// FIXME: need to add timeout handling here!!
this._preformSearch(searchStr, callback);
@@ -270,15 +270,15 @@
//embedded the style in the template string in 0.4.2 release, not good
templateCssString: null,
templateCssPath: dojo.uri.dojoUri("struts/ComboBox.css"),
-
+
//how many results are shown
searchLimit : 30,
-
+
transport : "",
-
+
//load options when page loads
preload : true,
-
+
//from Dojo's ComboBox
showResultList: function() {
// Our dear friend IE doesnt take max-height so we need to calculate that on
our own every time
@@ -297,6 +297,8 @@
var totalHeight = this.itemHeight * childs.length;
if(totalHeight < this.dropdownHeight) {
this.optionsListNode.style.height = totalHeight + 2 + "px";
+ } else {
+this.optionsListNode.style.height = this.dropdownHeight + "px";
}
this.popupWidget.open(this.domNode, this, this.downArrowNode);
@@ -387,22 +389,22 @@
if(!dojo.string.isBlank(this.notifyTopics)) {
this.notifyTopicsArray = this.notifyTopics.split(",");
}
-
+
//before topics
if(!dojo.string.isBlank(this.beforeNotifyTopics)) {
this.beforeNotifyTopicsArray = this.beforeNotifyTopics.split(",");
}
-
+
//after topics
if(!dojo.string.isBlank(this.afterNotifyTopics)) {
this.afterNotifyTopicsArray = this.afterNotifyTopics.split(",");
}
-
+
//error topics
if(!dojo.string.isBlank(this.errorNotifyTopics)) {
this.errorNotifyTopicsArray = this.errorNotifyTopics.split(",");
}
-
+
//value topics
if(!dojo.string.isBlank(this.valueNotifyTopics)) {
this.valueNotifyTopicsArray = this.valueNotifyTopics.split(",");
@@ -449,7 +451,7 @@
}
});
}
-
+
//before, after and error topics
var topicsArray = null;
switch(type) {
@@ -464,10 +466,10 @@
break;
case "valuechanged":
this.notifyTo(this.valueNotifyTopicsArray, [this.getSelectedValue(),
this.getSelectedKey(), this.getText(), this]);
-break;
+break;
}
},
-
+
notifyTo : function(topicsArray, params) {
var self = this;
if(topicsArray) {
@@ -480,7 +482,7 @@
});
}
},
-
+
log : function(text) {
dojo.debug("[" + (this.widgetId ? this.widgetId : "unknown") + "] " +
text);
},
@@ -501,7 +503,7 @@
this._startSearch(searchStr);
}
},
-
+
setSelectedKey : function(key) {
var data = this.dataProvider.data;
for(element in data) {
@@ -512,15 +514,15 @@
}
}
},
-
+
getSelectedKey : function() {
return this.comboBoxSelectionValue.value;
},
-
+
getSel
svn commit: r670209 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/
Author: mrdon
Date: Sat Jun 21 08:13:59 2008
New Revision: 670209
URL: http://svn.apache.org/viewvc?rev=670209&view=rev
Log:
First cut at a new filter strategy
WW-2193
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/CleanupOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/ExecuteOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/InitOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/PrepareOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/package-info.java
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/CleanupOperations.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/CleanupOperations.java?rev=670209&view=auto
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/CleanupOperations.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/CleanupOperations.java
Sat Jun 21 08:13:59 2008
@@ -0,0 +1,69 @@
+/*
+ * $Id: DefaultActionSupport.java 651946 2008-04-27 13:41:38Z apetrelli $
+ *
+ * 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.dispatcher.filter;
+
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.StrutsException;
+import com.opensymphony.xwork2.ActionContext;
+
+/**
+ * Contains cleanup operations in all stages for filters
+ */
+public class CleanupOperations {
+
+private Dispatcher dispatcher;
+
+public CleanupOperations(Dispatcher dispatcher) {
+this.dispatcher = dispatcher;
+}
+
+/**
+ * Cleans up the dispatcher instance
+ */
+public void cleanupDispatcher() {
+if (dispatcher == null) {
+throw new StrutsException("something is seriously wrong,
Dispatcher is not initialized (null) ");
+} else {
+try {
+dispatcher.cleanup();
+} finally {
+ActionContext.setContext(null);
+}
+}
+}
+
+/**
+ * Cleans up a request of thread locals
+ */
+public void cleanupRequest() {
+// always dontClean up the thread request, even if an action hasn't
been executed
+ActionContext.setContext(null);
+Dispatcher.setInstance(null);
+}
+
+/**
+ * Cleans up after the initialization process
+ */
+public void cleanupInit() {
+ActionContext.setContext(null);
+}
+
+}
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/ExecuteOperations.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/ExecuteOperations.java?rev=670209&view=auto
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/ExecuteOperations.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/ExecuteOperations.java
Sat Jun 21 08:13:59 2008
@@ -0,0 +1,79 @@
+/*
+ * $Id: DefaultActionSupport.java 651946 2008-04-27 13:41:38Z apetrelli $
+ *
+ * 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.
svn commit: r670231 [1/3] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: struts_dojo.js struts_dojo.js.uncompressed.js
Author: musachy Date: Sat Jun 21 10:14:19 2008 New Revision: 670231 URL: http://svn.apache.org/viewvc?rev=670231&view=rev Log: Sync custom build with latest changes in javascript code Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
svn commit: r670307 - in /struts/struts2/trunk/apps/blank/src/main: resources/struts.xml webapp/WEB-INF/web.xml
Author: mrdon Date: Sat Jun 21 21:00:00 2008 New Revision: 670307 URL: http://svn.apache.org/viewvc?rev=670307&view=rev Log: Converted web.xml to use new filter, added default action WW-2193 Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.xml struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/struts.xml?rev=670307&r1=670306&r2=670307&view=diff == --- struts/struts2/trunk/apps/blank/src/main/resources/struts.xml (original) +++ struts/struts2/trunk/apps/blank/src/main/resources/struts.xml Sat Jun 21 21:00:00 2008 @@ -10,6 +10,18 @@ + + + + + + +HelloWorld +/example + + + + Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml?rev=670307&r1=670306&r2=670307&view=diff == --- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Sat Jun 21 21:00:00 2008 @@ -5,7 +5,7 @@ struts2 - org.apache.struts2.dispatcher.FilterDispatcher + org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
svn commit: r670308 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter
Author: mrdon
Date: Sat Jun 21 21:00:43 2008
New Revision: 670308
URL: http://svn.apache.org/viewvc?rev=670308&view=rev
Log:
Better error handling in new filters, added autowire respect property to
default list
WW-2193
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java?rev=670308&r1=670307&r2=670308&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
Sat Jun 21 21:00:43 2008
@@ -49,7 +49,9 @@
cleanup = new CleanupOperations(dispatcher);
execute = new ExecuteOperations(filterConfig.getServletContext(),
dispatcher);
} finally {
-cleanup.cleanupInit();
+if (cleanup != null) {
+cleanup.cleanupInit();
+}
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java?rev=670308&r1=670307&r2=670308&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
Sat Jun 21 21:00:43 2008
@@ -44,7 +44,9 @@
prepare = new PrepareOperations(filterConfig.getServletContext(),
dispatcher);
cleanup = new CleanupOperations(dispatcher);
} finally {
-cleanup.cleanupInit();
+if (cleanup != null) {
+cleanup.cleanupInit();
+}
}
}
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=670308&r1=670307&r2=670308&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Sat Jun 21 21:00:43 2008
@@ -48,6 +48,10 @@
### valid values are: true, false (true is the default)
struts.objectFactory.spring.useClassCache = true
+### ensures the autowire strategy is always respected.
+### valid values are: true, false (false is the default)
+struts.objectFactory.spring.autoWire.alwaysRespect = false
+
### if specified, the default object type determiner can be overridden here
### Note: short-hand notation is supported in some cases, such as "tiger" or
"notiger"
### Alternatively, you can provide a
com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
svn commit: r670309 - /struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
Author: mrdon Date: Sat Jun 21 21:01:01 2008 New Revision: 670309 URL: http://svn.apache.org/viewvc?rev=670309&view=rev Log: Adding new filter to showcase WW-2193 Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?rev=670309&r1=670308&r2=670309&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Sat Jun 21 21:01:01 2008 @@ -7,13 +7,8 @@ Struts Showcase Application -struts-cleanup - org.apache.struts2.dispatcher.ActionContextCleanUp - - - -struts - org.apache.struts2.dispatcher.FilterDispatcher +struts-prepare + org.apache.struts2.dispatcher.filter.StrutsPrepareFilter actionPackages org.apache.struts2.showcase.person @@ -21,12 +16,17 @@ +struts-execute + org.apache.struts2.dispatcher.filter.StrutsExecuteFilter + + + sitemesh com.opensymphony.module.sitemesh.filter.PageFilter -struts-cleanup +struts-prepare /* @@ -36,7 +36,7 @@ -struts +struts-execute /*
svn commit: r670310 - /struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
Author: mrdon Date: Sat Jun 21 21:03:27 2008 New Revision: 670310 URL: http://svn.apache.org/viewvc?rev=670310&view=rev Log: Adding new filter to rest showcase WW-2193 Modified: struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml?rev=670310&r1=670309&r2=670310&view=diff == --- struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml Sat Jun 21 21:03:27 2008 @@ -12,7 +12,7 @@ action2 - org.apache.struts2.dispatcher.FilterDispatcher + org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter actionPackages org.apache.struts2.rest.example
svn commit: r670311 - /struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml
Author: mrdon Date: Sat Jun 21 21:05:11 2008 New Revision: 670311 URL: http://svn.apache.org/viewvc?rev=670311&view=rev Log: Changing filter to new struts filter WW-2193 Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml?rev=670311&r1=670310&r2=670311&view=diff == --- struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml Sat Jun 21 21:05:11 2008 @@ -7,7 +7,7 @@ Struts2 -org.apache.struts2.dispatcher.FilterDispatcher +org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
