Author: bdelacretaz
Date: Thu Jan 28 14:59:11 2010
New Revision: 904109
URL: http://svn.apache.org/viewvc?rev=904109&view=rev
Log:
SLING-1337 - sling.jcrinstall.folder.name.regexp config property should be trimmed
Modified:
sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java
Modified: sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java?rev=904109&r1=904108&r2=904109&view=diff
==============================================================================
--- sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java
(original)
+++ sling/trunk/installer/jcr/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java
Thu Jan 28 14:59:11 2010
@@ -191,7 +191,8 @@
// Configurable folder regexp, system property overrides default value
String folderNameRegexp = (String)getPropertyValue(context, FOLDER_NAME_REGEXP_PROPERTY);
if(folderNameRegexp != null) {
- log.info("Using configured ({}) folder name regexp {}", FOLDER_NAME_REGEXP_PROPERTY,
folderNameRegexp);
+ folderNameRegexp = folderNameRegexp.trim();
+ log.info("Using configured ({}) folder name regexp '{}'", FOLDER_NAME_REGEXP_PROPERTY,
folderNameRegexp);
} else {
folderNameRegexp = DEFAULT_FOLDER_NAME_REGEXP;
log.info("Using default folder name regexp '{}', not provided by {}", folderNameRegexp,
FOLDER_NAME_REGEXP_PROPERTY);
|