svn commit: r449344 - in /struts/struts2/trunk: ./ apps/showcase/ apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/ apps/showcase/src/main/resources/ apps/showcase/src/main/webapp/ apps/

[mrdon]

Author: mrdon
Date: Sat Sep 23 19:27:41 2006
New Revision: 449344

URL: http://svn.apache.org/viewvc?view=rev&rev=449344
Log:
Adds a legacy library to support Struts 1.3 Actions and ActionForms as is 
running in Struts
WW-1452

Added:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/GangsterForm.java

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/SaveGangsterAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDriven.jsp

struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDrivenResult.jsp
struts/struts2/trunk/legacy/   (with props)
struts/struts2/trunk/legacy/pom.xml
struts/struts2/trunk/legacy/src/
struts/struts2/trunk/legacy/src/main/
struts/struts2/trunk/legacy/src/main/java/
struts/struts2/trunk/legacy/src/main/java/org/
struts/struts2/trunk/legacy/src/main/resources/
struts/struts2/trunk/legacy/src/main/resources/struts-default.xml
struts/struts2/trunk/legacy/src/test/
struts/struts2/trunk/legacy/src/test/java/
struts/struts2/trunk/legacy/src/test/java/org/
struts/struts2/trunk/legacy/src/test/java/org/apache/
struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/
struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/

struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/DynaBeanPropertyAccessorTest.java

struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/ScopedModelDrivenInterceptorTest.java

struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/StrutsFactoryTest.java
struts/struts2/trunk/legacy/src/test/resources/
struts/struts2/trunk/legacy/src/test/resources/org/
struts/struts2/trunk/legacy/src/test/resources/org/apache/
struts/struts2/trunk/legacy/src/test/resources/org/apache/struts2/
struts/struts2/trunk/legacy/src/test/resources/org/apache/struts2/legacy/

struts/struts2/trunk/legacy/src/test/resources/org/apache/struts2/legacy/test-struts-factory.xml
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/test/org/apache/ti/legacy/test-struts-factory.xml
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp

struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=449344&r1=449343&r2=449344
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sat Sep 23 19:27:41 2006
@@ -25,6 +25,13 @@
 
 
 
+org.apache.struts
+struts2-legacy
+${pom.version}
+
+
+ 
+
javax.servlet
servlet-api
2.4

Added: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java?view=auto&rev=449344
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
 (added)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
 Sat Sep 23 19:27:41 2006
@@ -0,0 +1,40 @@
+/*
+ * $Id: Gangster.java 418530 2006-07-01 23:58:13Z mrdon $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.showcase.legacy;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import o

svn commit: r449350 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/ apps/showcase/src/main/resources/ legacy/src/main/java/org/apache/ legacy/src/main/java/

[mrdon]

Author: mrdon
Date: Sat Sep 23 21:09:38 2006
New Revision: 449350

URL: http://svn.apache.org/viewvc?view=rev&rev=449350
Log:
Adding the legacy module classes (silly local svn problem), minor improvements 
to support 
intelligent defaults, added documentation

Added:
struts/struts2/trunk/legacy/src/main/java/org/apache/
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/ActionFormResetInterceptor.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/ActionFormValidationInterceptor.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/DynaBeanPropertyAccessor.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/DynaBeanPropertyAccessor.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ScopedModelDriven.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/ScopedModelDriven.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ScopedModelDrivenInterceptor.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/ScopedModelDrivenInterceptor.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/StrutsFactory.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/StrutsFactory.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/WrapperActionForward.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/WrapperActionForward.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/WrapperActionMapping.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/WrapperActionMapping.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/WrapperExceptionConfig.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/WrapperExceptionConfig.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/WrapperModuleConfig.java
  - copied, changed from r449318, 
struts/sandbox/trunk/ti/phase1/jars/legacy/src/java/org/apache/ti/legacy/WrapperModuleConfig.java
Modified:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml

Modified: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java?view=diff&rev=449350&r1=449349&r2=449350
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
 (original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
 Sat Sep 23 21:09:38 2006
@@ -33,6 +33,7 @@
 @Override
 public ActionForward execute(ActionMapping mapping, ActionForm form, 
HttpServletRequest request, HttpServletResponse response) throws Exception {
 // Some code to load the gangster from the db as necessary
+
 return mapping.findForward("success");
 }
 

Modified: 
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml?view=diff&rev=449350&r1=449349&r2=449350
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml Sat 
Sep 23 21:09:38 2006
@@ -9,8 +9,6 @@



-   request
-   gangsterForm
org.apache.struts2.showcase.legacy.GangsterForm



Copied: 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
 (from r449318, 
struts/sa

svn commit: r449359 - in /struts/struts2/trunk: apps/showcase/src/main/resources/ core/src/main/resources/ legacy/src/main/java/org/apache/struts2/legacy/ legacy/src/test/java/org/apache/struts2/legac

[mrdon]

Author: mrdon
Date: Sat Sep 23 21:46:40 2006
New Revision: 449359

URL: http://svn.apache.org/viewvc?view=rev&rev=449359
Log:
Moving the scoped model driven interceptor over to xwork, adding interceptor to 
default
stack
WW-1452

Removed:

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ScopedModelDriven.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ScopedModelDrivenInterceptor.java

struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/ScopedModelDrivenInterceptorTest.java
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java

struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java

Modified: 
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml?view=diff&rev=449359&r1=449358&r2=449359
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml Sat 
Sep 23 21:46:40 2006
@@ -8,7 +8,7 @@



-   
+   
org.apache.struts2.showcase.legacy.GangsterForm



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?view=diff&rev=449359&r1=449358&r2=449359
==
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sat Sep 23 
21:46:40 2006
@@ -39,6 +39,7 @@
 
 
 
+
 
 
 
@@ -155,6 +156,7 @@
 
 
 
+
 
 
 

Modified: 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java?view=diff&rev=449359&r1=449358&r2=449359
==
--- 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
 (original)
+++ 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormResetInterceptor.java
 Sat Sep 23 21:46:40 2006
@@ -27,6 +27,7 @@
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
 
 /**
  *  Calls the reset() method on the ActionForm, if it exists.

Modified: 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java?view=diff&rev=449359&r1=449358&r2=449359
==
--- 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
 (original)
+++ 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/ActionFormValidationInterceptor.java
 Sat Sep 23 21:46:40 2006
@@ -28,6 +28,7 @@
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
 
 /**
  *  Calls the validate() method on the ActionForm, if it exists.  The errors 
are handled

Modified: 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java?view=diff&rev=449359&r1=449358&r2=449359
==
--- 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
 (original)
+++ 
struts/struts2/trunk/legacy/src/main/java/org/apache/struts2/legacy/LegacyAction.java
 Sat Sep 23 21:46:40 2006
@@ -38,6 +38,7 @@
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensympho

svn commit: r449363 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/ core/src/main/java/org/apache/struts2/config/ core/src/main/java/org/apache/struts2/dispatcher/ core/src/main/jav

[mrdon]

Author: mrdon
Date: Sat Sep 23 22:50:01 2006
New Revision: 449363

URL: http://svn.apache.org/viewvc?view=rev&rev=449363
Log:
Renaming the xml configuration provider to match the xwork one (not sure why I 
named it different 
to start with...)
WW-1349

Added:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
  - copied, changed from r449350, 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
Removed:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java

struts/struts2/trunk/legacy/src/test/java/org/apache/struts2/legacy/StrutsFactoryTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java?view=diff&rev=449363&r1=449362&r2=449363
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java 
Sat Sep 23 22:50:01 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2;
 
 import org.apache.struts2.config.Settings;
-import org.apache.struts2.config.StrutsXMLConfigurationProvider;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.springframework.mock.web.MockServletContext;
 
@@ -44,7 +44,7 @@
 Dispatcher.setInstance(du);
 configurationManager = new ConfigurationManager();
 configurationManager.addConfigurationProvider(
-new StrutsXMLConfigurationProvider("struts.xml", false));
+new StrutsXmlConfigurationProvider("struts.xml", false));
 du.setConfigurationManager(configurationManager);
 
 }

Copied: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
 (from r449350, 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java)
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?view=diff&rev=449363&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java&r1=449350&p2=struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java&r2=449363
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
 Sat Sep 23 22:50:01 2006
@@ -25,9 +25,9 @@
 /**
  * Override Xwork class so we can use an arbitrary config file
  */
-public class StrutsXMLConfigurationProvider extends XmlConfigurationProvider {
+public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider {
 
-private static final Log LOG = 
LogFactory.getLog(StrutsXMLConfigurationProvider.class);
+private static final Log LOG = 
LogFactory.getLog(StrutsXmlConfigurationProvider.class);
 private File baseDir = null;
 
 /** 
@@ -35,7 +35,7 @@
  * 
  * @param errorIfMissing If we should throw an exception if the file can't 
be found
  */
-public StrutsXMLConfigurationProvider(boolean errorIfMissing) {
+public StrutsXmlConfigurationProvider(boolean errorIfMissing) {
 this("struts.xml", errorIfMissing);
 }
 
@@ -45,7 +45,7 @@
  * @param filename The filename to look for
  * @param errorIfMissing If we should throw an exception if the file can't 
be found
  */
-public StrutsXMLConfigurationProvider(String filename, boolean 
errorIfMissing) {
+public StrutsXmlConfigurationProvider(String filename, boolean 
errorIfMissing) {
 super(filename, errorIfMissing);
 
 Map dtdMappings = new 
HashMap(getDtdMappings());

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=449363&r1=449362&r2=449363
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher

[Struts Wiki] Update of "StrutsAction2" by HenriYandell

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by HenriYandell:
http://wiki.apache.org/struts/StrutsAction2

The comment on the change is:
Fixing link to SAF2 Migration guide.

--
  This page is obsolete. 
  
- Please refer to the [http://struts.apache.org/struts-action2/index.html 
Action 2 website] and the 
[http://confluence.twdata.org/display/WW/Migration+Guide SAF2 Migration Guide].
+ Please refer to the [http://struts.apache.org/struts-action2/index.html 
Action 2 website] and the [http://cwiki.apache.org/WW/migration-guide.html SAF2 
Migration Guide].
  
  
  

[Struts Wiki] Update of "ShaleValidation" by WendySmoak

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by WendySmoak:
http://wiki.apache.org/struts/ShaleValidation

--
- #REDIRECT Shale/Validation
+ #REDIRECT Shale
  
- This page has moved to [:Shale/Validation] and should automatically re-direct.
+ This page has moved to http://wiki.apache.org/shale/ShaleValidation
  

[Struts Wiki] Update of "Shale" by WendySmoak

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by WendySmoak:
http://wiki.apache.org/struts/Shale

--
  
  || If you were redirected to this page from...  || ...then click here: ||
  || !ShaleRemoting   || 
http://wiki.apache.org/shale/ShaleRemoting ||
+ || !ShaleValidation || 
http://wiki.apache.org/shale/ShaleValidation ||
  
  These pages are slowly being migrated to the Shale wiki: 
http://wiki.apache.org/shale
  

svn commit: r449367 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/dispatcher/mapper/ main/java/org/apa

[mrdon]

Author: mrdon
Date: Sat Sep 23 23:49:04 2006
New Revision: 449367

URL: http://svn.apache.org/viewvc?view=rev&rev=449367
Log:
Modified the process of getting the configuration so that it would only look 
for unmodified
files once per request, and not for static resources.  The problem arose when I 
modified
the ActionMapper to take into consideration when determining the action mapping 
(allows
action names with slashes).  The Configuration was being checked before it 
determined if
the request was for a static file or not.

WW-493

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?view=diff&rev=449367&r1=449366&r2=449367
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
 Sat Sep 23 23:49:04 2006
@@ -20,6 +20,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsException;
 
+import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
 
 /**
@@ -29,6 +30,7 @@
 
 private static final Log LOG = 
LogFactory.getLog(StrutsXmlConfigurationProvider.class);
 private File baseDir = null;
+private String filename;
 
 /** 
  * Constructs the configuration provider
@@ -47,7 +49,7 @@
  */
 public StrutsXmlConfigurationProvider(String filename, boolean 
errorIfMissing) {
 super(filename, errorIfMissing);
-
+this.filename = filename;
 Map dtdMappings = new 
HashMap(getDtdMappings());
 dtdMappings.put("-//Apache Software Foundation//DTD Struts 
Configuration 2.0//EN", "struts-2.0.dtd");
 setDtdMappings(dtdMappings);
@@ -101,4 +103,21 @@
 } 
 return url;
 }
+
+/**
+ * Overrides needs reload to ensure it is only checked once per request
+ */
+@Override
+public boolean needsReload() {
+ActionContext ctx = ActionContext.getContext();
+String key = "configurationReload-"+filename;
+if (ctx.get(key) == null) {
+ctx.put(key, Boolean.TRUE);
+return super.needsReload();
+}
+return false;
+
+}
+
+
 }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=449367&r1=449366&r2=449367
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
 Sat Sep 23 23:49:04 2006
@@ -220,7 +220,7 @@
 ActionMapping mapping = null;
 try {
 mapper = ActionMapperFactory.getMapper();
-mapping = mapper.getMapping(request, 
du.getConfigurationManager().getConfiguration());
+mapping = mapper.getMapping(request, du.getConfigurationManager());
 } catch (Exception ex) {
 du.sendError(request, response, servletContext, 
response.SC_INTERNAL_SERVER_ERROR, ex);
 ActionContextCleanUp.cleanUp(req);

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java?view=diff&rev=449367&r1=449366&r2=449367
==

svn commit: r449368 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

[mrdon]

Author: mrdon
Date: Sat Sep 23 23:50:57 2006
New Revision: 449368

URL: http://svn.apache.org/viewvc?view=rev&rev=449368
Log:
Reformatting default action mapper
WW-1349

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?view=diff&rev=449368&r1=449367&r2=449368
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 Sat Sep 23 23:50:57 2006
@@ -36,130 +36,146 @@
 
 /**
  * 
- *
- * Default action mapper implementation, using the standard *.[ext] (where ext 
usually "action") pattern. The extension
- * is looked up from the Struts configuration key 
struts.action.exection.
- *
- *  To help with dealing with buttons and other related requirements, this 
mapper (and other [EMAIL PROTECTED] ActionMapper}s,
- * we hope) has the ability to name a button with some predefined prefix and 
have that button name alter the execution
- * behaviour. The four prefixes are:
- *
+ * 
+ * Default action mapper implementation, using the standard *.[ext] (where ext
+ * usually "action") pattern. The extension is looked up from the Struts
+ * configuration key struts.action.exection.
+ * 
+ *  To help with dealing with buttons and other related requirements, this
+ * mapper (and other [EMAIL PROTECTED] ActionMapper}s, we hope) has the 
ability to name a
+ * button with some predefined prefix and have that button name alter the
+ * execution behaviour. The four prefixes are:
+ * 
  * 
- *
+ * 
  * Method prefix - method:default
- *
+ * 
  * Action prefix - action:dashboard
- *
+ * 
  * Redirect prefix - redirect:cancel.jsp
- *
+ * 
  * Redirect-action prefix - redirect-action:cancel
- *
+ * 
  * 
- *
- *  In addition to these four prefixes, this mapper also understands the 
action naming pattern of foo!bar in
- * either the extension form (eg: foo!bar.action) or in the prefix form (eg: 
action:foo!bar). This syntax tells this mapper
- * to map to the action named foo and the method bar.
- *
+ * 
+ *  In addition to these four prefixes, this mapper also understands the
+ * action naming pattern of foo!bar in either the extension form (eg:
+ * foo!bar.action) or in the prefix form (eg: action:foo!bar). This syntax 
tells
+ * this mapper to map to the action named foo and the method bar.
+ * 
  * 
- *
+ * 
  *  Method Prefix 
- *
+ * 
  * 
- *
- * With method-prefix, instead of calling baz action's execute() method (by 
default if it isn't overriden in struts.xml
- * to be something else), the baz action's anotherMethod() will be called. A 
very elegant way determine which button is
- * clicked. Alternatively, one would have submit button set a particular value 
on the action when clicked, and the
- * execute() method decides on what to do with the setted value depending on 
which button is clicked.
- *
+ * 
+ * With method-prefix, instead of calling baz action's execute() method (by
+ * default if it isn't overriden in struts.xml to be something else), the baz
+ * action's anotherMethod() will be called. A very elegant way determine which
+ * button is clicked. Alternatively, one would have submit button set a
+ * particular value on the action when clicked, and the execute() method 
decides
+ * on what to do with the setted value depending on which button is clicked.
+ * 
  * 
- *
+ * 
  * 
- * 
- * 
- * 
- * 
- * 
- * 
- * 
+ *  
+ *  
+ *  
+ *  
+ *  
+ *  
+ *  
  * 
- *
+ * 
  *  Action prefix 
- *
+ * 
  * 
- *
- * With action-prefix, instead of executing baz action's execute() method (by 
default if it isn't overriden in struts.xml
- * to be something else), the anotherAction action's execute() method 
(assuming again if it isn't overriden with
- * something else in struts.xml) will be executed.
- *
+ * 
+ * With action-prefix, instead of executing baz action's execute() method (by
+ * default if it isn't overriden in struts.xml to be something else), the
+ * anotherAction action's execute() method (assuming again if it isn't 
overriden
+ * with something else in struts.xml) will be executed.
+ * 
  * 
- *
+ * 
  * 
- * 
- * <

svn commit: r449371 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

[mrdon]

Author: mrdon
Date: Sat Sep 23 23:59:07 2006
New Revision: 449371

URL: http://svn.apache.org/viewvc?view=rev&rev=449371
Log:
Fixed test
WW-1349

Modified:

struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?view=diff&rev=449371&r1=449370&r2=449371
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
 Sat Sep 23 23:59:07 2006
@@ -176,7 +176,7 @@
 ActionMapping actionMapping = new ActionMapping();
 
 DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-defaultActionMapper.parseNameAndNamespace("someAction.action", 
actionMapping, config);
+defaultActionMapper.parseNameAndNamespace("someAction", actionMapping, 
config);
 
 assertEquals(actionMapping.getName(), "someAction");
 assertEquals(actionMapping.getNamespace(), "");
@@ -186,7 +186,7 @@
 ActionMapping actionMapping = new ActionMapping();
 
 DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-defaultActionMapper.parseNameAndNamespace("/someAction.action", 
actionMapping, config);
+defaultActionMapper.parseNameAndNamespace("/someAction", 
actionMapping, config);
 
 assertEquals(actionMapping.getName(), "someAction");
 assertEquals(actionMapping.getNamespace(), "/");
@@ -196,7 +196,7 @@
 ActionMapping actionMapping = new ActionMapping();
 
 DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-defaultActionMapper.parseNameAndNamespace("/my/someAction.action", 
actionMapping, config);
+defaultActionMapper.parseNameAndNamespace("/my/someAction", 
actionMapping, config);
 
 assertEquals(actionMapping.getName(), "someAction");
 assertEquals(actionMapping.getNamespace(), "/my");