[Struts Wiki] Update of "StrutsUpgradeNotes11to124" by LeoLansford
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 LeoLansford: http://wiki.apache.org/struts/StrutsUpgradeNotes11to124 -- moduleConfig.freeze(); getServletContext().setAttribute(Globals.MODULE_KEY, moduleConfig);}}} + == Action.perform(...) is changed to Action.execute(...) == + + For your action classes that extend org.apache.struts.action.Action, be sure to implement the ''execute'' method. Previously the method to implement was ''perform'', and because the ''perform'' method still exists as a do-nothing method your code will compile and deploy fine, and leave you wondering why it's not working. CategoryHomepage StrutsUpgrade
[Struts Wiki] Update of "StrutsUpgradeNotes11to124" by NiallPemberton
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 NiallPemberton:
http://wiki.apache.org/struts/StrutsUpgradeNotes11to124
The comment on the change is:
Correct comment about Actions execute/perform methods
--
moduleConfig.freeze();
getServletContext().setAttribute(Globals.MODULE_KEY, moduleConfig);}}}
- == Action.perform(...) is changed to Action.execute(...) ==
+ == Change Action.perform(...) to Action.execute(...) ==
- For your action classes that extend org.apache.struts.action.Action, be sure
to implement the ''execute'' method. Previously the method to implement was
''perform'', and because the ''perform'' method still exists as a do-nothing
method your code will compile and deploy fine, and leave you wondering why it's
not working.
+ In 'Struts 1.1' the {{{execute(...)}}} method was introduced and
{{{perform(...)}}} method deprecated in
[http://svn.apache.org/repos/asf/struts/struts1/tags/STRUTS_1_1/src/share/org/apache/struts/action/Action.java
Action]. In Struts 1.1 the deprecated {{{perform(...)}}} method continues to
work.
+
+ In 'Struts 1.2.x' the deprecated {{{perform(...)}}} method was
removed from
[http://svn.apache.org/repos/asf/struts/struts1/tags/STRUTS_1_2_4/src/share/org/apache/struts/action/Action.java
Action] and therefore any Action's which still implement {{{perform(...)}}}
rather than {{{execute(...)}}} no longer function and should be changed to
implement {{{execute(...)}}}.
+
CategoryHomepage StrutsUpgrade
svn commit: r652725 - in /struts/struts2/trunk/core/src/test/resources: XSLTResultTest-validators.xml XSLTResultTest4.xsl
Author: mrdon Date: Thu May 1 18:00:29 2008 New Revision: 652725 URL: http://svn.apache.org/viewvc?rev=652725&view=rev Log: Fixing xslt test failing when no internet connection available WW-1942 Added: struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml - copied, changed from r652716, struts/struts2/trunk/core/src/test/resources/validators.xml Modified: struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl Copied: struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml (from r652716, struts/struts2/trunk/core/src/test/resources/validators.xml) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml?p2=struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml&p1=struts/struts2/trunk/core/src/test/resources/validators.xml&r1=652716&r2=652725&rev=652725&view=diff == --- struts/struts2/trunk/core/src/test/resources/validators.xml (original) +++ struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml Thu May 1 18:00:29 2008 @@ -21,9 +21,6 @@ * under the License. */ --> -http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd";> Modified: struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl?rev=652725&r1=652724&r2=652725&view=diff == --- struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl (original) +++ struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl Thu May 1 18:00:29 2008 @@ -25,7 +25,7 @@ xmlns="http://www.w3.org/TR/xhtml1/strict";> - + \ No newline at end of file
[OSS Bamboo] Struts 2 SVN - Main Build build 803 has FAILED (5 tests failed). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Fixing xslt test failing when no internet connection available WW-1942 > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl (652725) > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml > (652725) --- The build has 5 failed tests and 785 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-803 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 470 has FAILED (5 tests failed). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Fixing xslt test failing when no internet connection available WW-1942 > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl (652725) > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml > (652725) --- The build has 5 failed tests and 785 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-470 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 804 has FAILED (5 tests failed, no failures were new)
This is a manual build of Struts 2 SVN - Main Build. --- The build has 5 failed tests and 785 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-804 to find out more. Thanks, Bamboo
svn commit: r652734 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ test/java/org/apache/struts2/config/
Author: mrdon
Date: Thu May 1 19:29:02 2008
New Revision: 652734
URL: http://svn.apache.org/viewvc?rev=652734&view=rev
Log:
Fixing locale so it can be set in struts.xml
WW-2068
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java?rev=652734&r1=652733&r2=652734&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
Thu May 1 19:29:02 2008
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.Locale;
+import java.util.StringTokenizer;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -30,10 +31,19 @@
import com.opensymphony.xwork2.inject.ContainerBuilder;
import com.opensymphony.xwork2.inject.Context;
import com.opensymphony.xwork2.inject.Factory;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.location.LocatableProperties;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.StrutsConstants;
public class LegacyPropertiesConfigurationProvider implements
ConfigurationProvider {
+/**
+ * The Logging instance for this class.
+ */
+private static final Logger LOG =
LoggerFactory.getLogger(LegacyPropertiesConfigurationProvider.class);
+
public void destroy() {
Settings.reset();
}
@@ -58,10 +68,31 @@
loadSettings(props, settings);
-// Set default locale
-final Locale locale = settings.getLocale();
+// Set default locale by lazily resolving the locale property as
needed into a Locale object
builder.factory(Locale.class, new Factory() {
-public Object create(Context context) throws Exception {
+private Locale locale;
+
+public synchronized Object create(Context context) throws
Exception {
+if (locale == null) {
+String loc =
context.getContainer().getInstance(String.class, StrutsConstants.STRUTS_LOCALE);
+if (loc != null) {
+StringTokenizer localeTokens = new
StringTokenizer(loc, "_");
+String lang = null;
+String country = null;
+
+if (localeTokens.hasMoreTokens()) {
+lang = localeTokens.nextToken();
+}
+
+if (localeTokens.hasMoreTokens()) {
+country = localeTokens.nextToken();
+}
+locale = new Locale(lang, country);
+} else {
+LOG.info("No locale define, substituting the default
VM locale");
+locale = Locale.getDefault();
+}
+}
return locale;
}
});
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java?rev=652734&r1=652733&r2=652734&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java
Thu May 1 19:29:02 2008
@@ -57,6 +57,7 @@
* [EMAIL PROTECTED] #listImpl()}
* [EMAIL PROTECTED] #isSetImpl(String)}
*
+ * @deprecated Since Struts 2.1.2
*/
class Settings {
@@ -124,27 +125,7 @@
* @see java.util.Locale#getDefault()
*/
public static Locale getLocale() {
-if (locale == null) {
-try {
-StringTokenizer localeTokens = new
StringTokenizer(get(StrutsConstants.STRUTS_LOCALE), "_");
-String lang = null;
-String country = null;
-
-if (localeTokens.hasMoreTokens()) {
-lang = localeTokens.nextToken();
-}
-
-if (localeTok
svn commit: r652737 - in /struts/struts2/trunk/core/src/test/resources: XSLTResultTest-val.xml XSLTResultTest-validators.xml XSLTResultTest4.xsl
Author: mrdon Date: Thu May 1 19:33:03 2008 New Revision: 652737 URL: http://svn.apache.org/viewvc?rev=652737&view=rev Log: Fixing broken tests due to conflicting file name WW-1942 Added: struts/struts2/trunk/core/src/test/resources/XSLTResultTest-val.xml (props changed) - copied unchanged from r652725, struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml Removed: struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml Modified: struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl Propchange: struts/struts2/trunk/core/src/test/resources/XSLTResultTest-val.xml -- svn:eol-style = native Propchange: struts/struts2/trunk/core/src/test/resources/XSLTResultTest-val.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl?rev=652737&r1=652736&r2=652737&view=diff == --- struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl (original) +++ struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl Thu May 1 19:33:03 2008 @@ -25,7 +25,7 @@ xmlns="http://www.w3.org/TR/xhtml1/strict";> - + \ No newline at end of file
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 471 was SUCCESSFUL (with 792 tests). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 2 changes by 1 author: *Don Brown* made the following changes at Comment: Fixing broken tests due to conflicting file name WW-1942 > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest-val.xml (652737) > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl (652737) > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml > (652737) *Don Brown* made the following changes at Comment: Fixing locale so it can be set in struts.xml WW-2068 > /struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java > (652734) > /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java > (652734) > /struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java > (652734) > /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java > (652734) --- All 792 tests passed. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-471 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 805 was SUCCESSFUL (with 792 tests). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 2 changes by 1 author: *Don Brown* made the following changes at Comment: Fixing broken tests due to conflicting file name WW-1942 > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest-val.xml (652737) > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest4.xsl (652737) > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest-validators.xml > (652737) *Don Brown* made the following changes at Comment: Fixing locale so it can be set in struts.xml WW-2068 > /struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java > (652734) > /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Settings.java > (652734) > /struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java > (652734) > /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java > (652734) --- All 792 tests passed. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-805 to find out more. Thanks, Bamboo
svn commit: r652749 - in /struts/struts2/trunk: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ plugin
Author: mrdon Date: Thu May 1 20:47:03 2008 New Revision: 652749 URL: http://svn.apache.org/viewvc?rev=652749&view=rev Log: [maven-release-plugin] prepare release STRUTS_2_1_2 Modified: struts/struts2/trunk/apps/blank/pom.xml struts/struts2/trunk/apps/mailreader/pom.xml struts/struts2/trunk/apps/pom.xml struts/struts2/trunk/apps/portlet/pom.xml struts/struts2/trunk/apps/rest-showcase/pom.xml struts/struts2/trunk/apps/showcase/pom.xml struts/struts2/trunk/core/pom.xml struts/struts2/trunk/plugins/codebehind/pom.xml struts/struts2/trunk/plugins/config-browser/pom.xml struts/struts2/trunk/plugins/dojo/pom.xml struts/struts2/trunk/plugins/dwr/pom.xml struts/struts2/trunk/plugins/jasperreports/pom.xml struts/struts2/trunk/plugins/jfreechart/pom.xml struts/struts2/trunk/plugins/jsf/pom.xml struts/struts2/trunk/plugins/junit/pom.xml struts/struts2/trunk/plugins/pell-multipart/pom.xml struts/struts2/trunk/plugins/plexus/pom.xml struts/struts2/trunk/plugins/pom.xml struts/struts2/trunk/plugins/portlet/pom.xml struts/struts2/trunk/plugins/rest/pom.xml struts/struts2/trunk/plugins/sitegraph/pom.xml struts/struts2/trunk/plugins/sitemesh/pom.xml struts/struts2/trunk/plugins/spring/pom.xml struts/struts2/trunk/plugins/struts1/pom.xml struts/struts2/trunk/plugins/testng/pom.xml struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=652749&r1=652748&r2=652749&view=diff == --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Thu May 1 20:47:03 2008 @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.1.2-SNAPSHOT +2.1.2 org.apache.struts struts2-blank @@ -34,9 +34,9 @@ Blank Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/ + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/blank + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/blank + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/blank Modified: struts/struts2/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=652749&r1=652748&r2=652749&view=diff == --- struts/struts2/trunk/apps/mailreader/pom.xml (original) +++ struts/struts2/trunk/apps/mailreader/pom.xml Thu May 1 20:47:03 2008 @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.1.2-SNAPSHOT + 2.1.2 org.apache.struts struts2-mailreader @@ -34,9 +34,9 @@ Starter Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/ + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=652749&r1=652748&r2=652749&view=diff == --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Thu May 1 20:47:03 2008 @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.1.2-SNAPSHOT +2.1.2 org.apache.struts struts2-apps @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/ + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps Modified: struts/struts2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=652749&r1=652748&r2=652749&view=diff ==
svn commit: r652750 - in /struts/struts2/tags/STRUTS_2_1_2: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-bro
Author: mrdon Date: Thu May 1 20:47:13 2008 New Revision: 652750 URL: http://svn.apache.org/viewvc?rev=652750&view=rev Log: [maven-release-plugin] copy for tag STRUTS_2_1_2 Added: struts/struts2/tags/STRUTS_2_1_2/ - copied from r652745, struts/struts2/trunk/ struts/struts2/tags/STRUTS_2_1_2/apps/blank/pom.xml - copied unchanged from r652749, struts/struts2/trunk/apps/blank/pom.xml struts/struts2/tags/STRUTS_2_1_2/apps/mailreader/pom.xml - copied unchanged from r652749, struts/struts2/trunk/apps/mailreader/pom.xml struts/struts2/tags/STRUTS_2_1_2/apps/pom.xml - copied unchanged from r652749, struts/struts2/trunk/apps/pom.xml struts/struts2/tags/STRUTS_2_1_2/apps/portlet/pom.xml - copied unchanged from r652749, struts/struts2/trunk/apps/portlet/pom.xml struts/struts2/tags/STRUTS_2_1_2/apps/rest-showcase/pom.xml - copied unchanged from r652749, struts/struts2/trunk/apps/rest-showcase/pom.xml struts/struts2/tags/STRUTS_2_1_2/apps/showcase/pom.xml - copied unchanged from r652749, struts/struts2/trunk/apps/showcase/pom.xml struts/struts2/tags/STRUTS_2_1_2/core/pom.xml - copied unchanged from r652749, struts/struts2/trunk/core/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/codebehind/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/codebehind/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/config-browser/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/config-browser/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/dojo/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/dojo/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/dwr/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/dwr/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/jasperreports/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/jasperreports/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/jfreechart/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/jfreechart/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/jsf/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/jsf/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/junit/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/junit/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/pell-multipart/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/pell-multipart/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/plexus/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/plexus/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/portlet/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/portlet/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/rest/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/rest/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/sitegraph/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/sitegraph/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/sitemesh/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/sitemesh/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/spring/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/spring/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/struts1/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/struts1/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/testng/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/testng/pom.xml struts/struts2/tags/STRUTS_2_1_2/plugins/tiles/pom.xml - copied unchanged from r652749, struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/tags/STRUTS_2_1_2/pom.xml - copied unchanged from r652749, struts/struts2/trunk/pom.xml
svn commit: r652751 - in /struts/struts2/trunk: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ plugin
Author: mrdon Date: Thu May 1 20:47:24 2008 New Revision: 652751 URL: http://svn.apache.org/viewvc?rev=652751&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: struts/struts2/trunk/apps/blank/pom.xml struts/struts2/trunk/apps/mailreader/pom.xml struts/struts2/trunk/apps/pom.xml struts/struts2/trunk/apps/portlet/pom.xml struts/struts2/trunk/apps/rest-showcase/pom.xml struts/struts2/trunk/apps/showcase/pom.xml struts/struts2/trunk/core/pom.xml struts/struts2/trunk/plugins/codebehind/pom.xml struts/struts2/trunk/plugins/config-browser/pom.xml struts/struts2/trunk/plugins/dojo/pom.xml struts/struts2/trunk/plugins/dwr/pom.xml struts/struts2/trunk/plugins/jasperreports/pom.xml struts/struts2/trunk/plugins/jfreechart/pom.xml struts/struts2/trunk/plugins/jsf/pom.xml struts/struts2/trunk/plugins/junit/pom.xml struts/struts2/trunk/plugins/pell-multipart/pom.xml struts/struts2/trunk/plugins/plexus/pom.xml struts/struts2/trunk/plugins/pom.xml struts/struts2/trunk/plugins/portlet/pom.xml struts/struts2/trunk/plugins/rest/pom.xml struts/struts2/trunk/plugins/sitegraph/pom.xml struts/struts2/trunk/plugins/sitemesh/pom.xml struts/struts2/trunk/plugins/spring/pom.xml struts/struts2/trunk/plugins/struts1/pom.xml struts/struts2/trunk/plugins/testng/pom.xml struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=652751&r1=652750&r2=652751&view=diff == --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Thu May 1 20:47:24 2008 @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.1.2 +2.1.3-SNAPSHOT org.apache.struts struts2-blank @@ -34,9 +34,9 @@ Blank Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/blank - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/blank - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/blank + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/ Modified: struts/struts2/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=652751&r1=652750&r2=652751&view=diff == --- struts/struts2/trunk/apps/mailreader/pom.xml (original) +++ struts/struts2/trunk/apps/mailreader/pom.xml Thu May 1 20:47:24 2008 @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.1.2 + 2.1.3-SNAPSHOT org.apache.struts struts2-mailreader @@ -34,9 +34,9 @@ Starter Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/ Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=652751&r1=652750&r2=652751&view=diff == --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Thu May 1 20:47:24 2008 @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.1.2 +2.1.3-SNAPSHOT org.apache.struts struts2-apps @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/ Modified: struts/struts2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=652751&r1=652750&r2=652751&view=diff
svn commit: r652763 - /struts/struts2/tags/STRUTS_2_1_2/assembly/pom.xml
Author: mrdon Date: Thu May 1 21:51:02 2008 New Revision: 652763 URL: http://svn.apache.org/viewvc?rev=652763&view=rev Log: Fixing assembly version Modified: struts/struts2/tags/STRUTS_2_1_2/assembly/pom.xml Modified: struts/struts2/tags/STRUTS_2_1_2/assembly/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_1_2/assembly/pom.xml?rev=652763&r1=652762&r2=652763&view=diff == --- struts/struts2/tags/STRUTS_2_1_2/assembly/pom.xml (original) +++ struts/struts2/tags/STRUTS_2_1_2/assembly/pom.xml Thu May 1 21:51:02 2008 @@ -33,7 +33,7 @@ org.apache.struts struts2-parent -2.1.2-SNAPSHOT +2.1.2
svn commit: r652766 - /struts/struts2/trunk/assembly/pom.xml
Author: mrdon Date: Thu May 1 22:15:01 2008 New Revision: 652766 URL: http://svn.apache.org/viewvc?rev=652766&view=rev Log: Fixing assembly pom version Modified: struts/struts2/trunk/assembly/pom.xml Modified: struts/struts2/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=652766&r1=652765&r2=652766&view=diff == --- struts/struts2/trunk/assembly/pom.xml (original) +++ struts/struts2/trunk/assembly/pom.xml Thu May 1 22:15:01 2008 @@ -33,7 +33,7 @@ org.apache.struts struts2-parent -2.1.2-SNAPSHOT +2.1.3-SNAPSHOT
svn commit: r652768 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Author: mrdon
Date: Thu May 1 22:34:09 2008
New Revision: 652768
URL: http://svn.apache.org/viewvc?rev=652768&view=rev
Log:
Reformatting annoying code
WW-2623
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
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?rev=652768&r1=652767&r2=652768&view=diff
==
---
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
Thu May 1 22:34:09 2008
@@ -65,90 +65,89 @@
/**
* Master filter for Struts that handles four distinct
* responsibilities:
- *
+ *
*
- *
+ *
* Executing actions
- *
+ *
* Cleaning up the [EMAIL PROTECTED] ActionContext} (see note)
- *
+ *
* Serving static content
- *
+ *
* Kicking off XWork's interceptor chain for the request lifecycle
- *
+ *
*
- *
+ *
* IMPORTANT: this filter must be mapped to all requests. Unless
you know exactly what you are doing, always
* map to this URL pattern: /*
- *
+ *
* Executing actions
- *
+ *
* This filter executes actions by consulting the [EMAIL PROTECTED]
ActionMapper} and determining if the requested URL should
* invoke an action. If the mapper indicates it should, the rest of the
filter chain is stopped and the action is
* invoked. This is important, as it means that filters like the SiteMesh
filter must be placed before this
* filter or they will not be able to decorate the output of actions.
- *
+ *
* Cleaning up the [EMAIL PROTECTED] ActionContext}
- *
+ *
* This filter will also automatically clean up the [EMAIL PROTECTED]
ActionContext} for you, ensuring that no memory leaks
* take place. However, this can sometimes cause problems integrating with
other products like SiteMesh. See [EMAIL PROTECTED]
* ActionContextCleanUp} for more information on how to deal with this.
- *
+ *
* Serving static content
- *
+ *
* This filter also serves common static content needed when using
various parts of Struts, such as JavaScript
* files, CSS files, etc. It works by looking for requests to /struts/*, and
then mapping the value after "/struts/"
* to common packages in Struts and, optionally, in your class path. By
default, the following packages are
* automatically searched:
- *
+ *
*
- *
+ *
* org.apache.struts2.static
- *
+ *
* template
- *
+ *
*
- *
+ *
* This means that you can simply request /struts/xhtml/styles.css and
the XHTML UI theme's default stylesheet
* will be returned. Likewise, many of the AJAX UI components require various
JavaScript files, which are found in the
* org.apache.struts2.static package. If you wish to add additional packages
to be searched, you can add a comma
* separated (space, tab and new line will do as well) list in the filter init
parameter named "packages". Be
* careful, however, to expose any packages that may have sensitive
information, such as properties file with
* database access credentials.
- *
*
- *
+ *
+ *
*
- *
+ *
* This filter supports the following init-params:
*
- *
+ *
*
- *
+ *
* config - a comma-delimited list of XML configuration files to
load.
- *
+ *
* actionPackages - a comma-delimited list of Java packages to scan
for Actions.
- *
+ *
* configProviders - a comma-delimited list of Java classes that
implement the
* [EMAIL PROTECTED] ConfigurationProvider} interface that should be used for
building the [EMAIL PROTECTED] Configuration}.
- *
+ *
* loggerFactory - The class name of the [EMAIL PROTECTED]
LoggerFactory} implementation.
- *
+ *
* * - any other parameters are treated as framework constants.
- *
+ *
*
- *
+ *
*
- *
+ *
*
- *
+ *
* To use a custom [EMAIL PROTECTED] Dispatcher}, the
createDispatcher() method could be overriden by
* the subclass.
*
+ * @version $Date$ $Id$
* @see ActionMapper
* @see ActionContextCleanUp
- *
- * @version $Date$ $Id$
*/
public class FilterDispatcher implements StrutsStatics, Filter {
@@ -229,22 +228,22 @@
if (factoryName != null) {
try {
Class cls = ClassLoaderUtils.loadClass(factoryName,
this.getClass());
-LoggerFactory fac = (LoggerFactory)cls.newInstance();
+LoggerFactory fac = (LoggerFactory) cls.newInstance();
LoggerFactory.setLoggerFactory(fac);
} catch (InstantiationException e) {
-System.err.println("Unable to instantiate logger factory:
"+factoryName+", using default");
+System.err.println("Unable to instantiate logger factory: " +
factoryName + ", using
