Revision: 462
http://svn.sourceforge.net/stripes/?rev=462&view=rev
Author: tfenne
Date: 2006-10-29 05:14:52 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Merge of fix for STS-293 on to the branch.
Modified Paths:
--------------
branches/1.4.x/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
branches/1.4.x/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
branches/1.4.x/stripes/src/net/sourceforge/stripes/localization/DefaultLocalePicker.java
Added Paths:
-----------
branches/1.4.x/stripes/src/net/sourceforge/stripes/util/StringUtil.java
Modified:
branches/1.4.x/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java
===================================================================
---
branches/1.4.x/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java
2006-10-29 13:08:11 UTC (rev 461)
+++
branches/1.4.x/stripes/src/net/sourceforge/stripes/config/RuntimeConfiguration.java
2006-10-29 13:14:52 UTC (rev 462)
@@ -30,6 +30,7 @@
import net.sourceforge.stripes.tag.TagErrorRendererFactory;
import net.sourceforge.stripes.util.Log;
import net.sourceforge.stripes.util.ReflectUtil;
+import net.sourceforge.stripes.util.StringUtil;
import net.sourceforge.stripes.validation.TypeConverterFactory;
import java.util.Collection;
@@ -163,7 +164,7 @@
return null;
}
else {
- String[] classNames = classList.split(",");
+ String[] classNames = StringUtil.standardSplit(classList);
Map<LifecycleStage, Collection<Interceptor>> map =
new HashMap<LifecycleStage, Collection<Interceptor>>();
Modified:
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
===================================================================
---
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2006-10-29 13:08:11 UTC (rev 461)
+++
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2006-10-29 13:14:52 UTC (rev 462)
@@ -25,6 +25,7 @@
import net.sourceforge.stripes.exception.StripesServletException;
import net.sourceforge.stripes.util.Log;
import net.sourceforge.stripes.util.ResolverUtil;
+import net.sourceforge.stripes.util.StringUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletContext;
@@ -515,7 +516,7 @@
String temp = bootstrap.getProperty(URL_FILTERS);
if (temp != null) {
- urlFilters.addAll(Arrays.asList( temp.split(",")));
+ urlFilters.addAll(Arrays.asList( StringUtil.standardSplit(temp) ));
}
return urlFilters;
@@ -533,7 +534,7 @@
String temp = bootstrap.getProperty(PACKAGE_FILTERS);
if (temp != null) {
- packageFilters.addAll(Arrays.asList( temp.split(",")));
+ packageFilters.addAll(Arrays.asList(
StringUtil.standardSplit(temp) ));
}
return packageFilters;
Modified:
branches/1.4.x/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
===================================================================
---
branches/1.4.x/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
2006-10-29 13:08:11 UTC (rev 461)
+++
branches/1.4.x/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
2006-10-29 13:14:52 UTC (rev 462)
@@ -19,6 +19,7 @@
import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.util.Log;
import net.sourceforge.stripes.util.ResolverUtil;
+import net.sourceforge.stripes.util.StringUtil;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -236,7 +237,7 @@
String temp = bootstrap.getProperty(URL_FILTERS);
if (temp != null) {
- urlFilters.addAll(Arrays.asList( temp.split(",")));
+ urlFilters.addAll(Arrays.asList( StringUtil.standardSplit(temp) ));
}
return urlFilters;
@@ -254,7 +255,7 @@
String temp = bootstrap.getProperty(PACAKGE_FILTERS);
if (temp != null) {
- packageFilters.addAll(Arrays.asList( temp.split(",")));
+ packageFilters.addAll(Arrays.asList(
StringUtil.standardSplit(temp) ));
}
return packageFilters;
Modified:
branches/1.4.x/stripes/src/net/sourceforge/stripes/localization/DefaultLocalePicker.java
===================================================================
---
branches/1.4.x/stripes/src/net/sourceforge/stripes/localization/DefaultLocalePicker.java
2006-10-29 13:08:11 UTC (rev 461)
+++
branches/1.4.x/stripes/src/net/sourceforge/stripes/localization/DefaultLocalePicker.java
2006-10-29 13:14:52 UTC (rev 462)
@@ -16,6 +16,7 @@
import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.util.Log;
+import net.sourceforge.stripes.util.StringUtil;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -79,7 +80,7 @@
}
else {
// Split apart the Locales on commas, and then parse the local
strings into their bits
- String[] localeStrings = configuredLocales.split(",");
+ String[] localeStrings =
StringUtil.standardSplit(configuredLocales);
for (String localeString : localeStrings) {
// Each locale string can be made up of two parts,
locale:encoding
// and the locale can be made up of up to three segment, e.g.
en_US_PC
Copied: branches/1.4.x/stripes/src/net/sourceforge/stripes/util/StringUtil.java
(from rev 461, trunk/stripes/src/net/sourceforge/stripes/util/StringUtil.java)
===================================================================
--- branches/1.4.x/stripes/src/net/sourceforge/stripes/util/StringUtil.java
(rev 0)
+++ branches/1.4.x/stripes/src/net/sourceforge/stripes/util/StringUtil.java
2006-10-29 13:14:52 UTC (rev 462)
@@ -0,0 +1,34 @@
+package net.sourceforge.stripes.util;
+
+import java.util.regex.Pattern;
+
+/**
+ * Provies utility methods for manipulating and parsing Strings.
+ *
+ * @author Tim Fennell
+ * @since Stripes 1.4.2
+ */
+public class StringUtil {
+ /**
+ * A regular expression for splitting apart a String where individual
parts are
+ * separated by any whitespace (including new lines) and/or a comma.
+ */
+ private static final Pattern STANDARD_SPLIT = Pattern.compile("[\\s,]+");
+
+ /**
+ * Splits apart the input String on any whitespace and/or commas. Leading
and trailing
+ * whitespace are ignored. If a null String is provided as input a zero
length array
+ * will be returned.
+ *
+ * @param input the String to split apart
+ * @return an array of substrings of the input String based on the split
+ */
+ public static String[] standardSplit(String input) {
+ if (input == null) {
+ return new String[0];
+ }
+ else {
+ return STANDARD_SPLIT.split(input.trim());
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
