Author: cziegeler
Date: Fri May 20 06:38:50 2011
New Revision: 1125253
URL: http://svn.apache.org/viewvc?rev=1125253&view=rev
Log:
SLING-2031 : Use bundle location to create path for persisting new
configurations
Modified:
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
sling/trunk/installer/providers/jcr/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java?rev=1125253&r1=1125252&r2=1125253&view=diff
==============================================================================
---
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
(original)
+++
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Fri May 20 06:38:50 2011
@@ -299,8 +299,15 @@ public class JcrInstaller implements Eve
// setup default path for new configurations
this.newConfigPath =
OsgiUtil.toString(context.getProperties().get(PROP_NEW_CONFIG_PATH),
DEFAULT_NEW_CONFIG_PATH);
final boolean postSlash = !newConfigPath.endsWith("/");
+ if ( postSlash ) {
+ this.newConfigPath = newConfigPath.concat("/");
+ }
final boolean preSlash = !newConfigPath.startsWith("/");
- this.newConfigPath = this.folderNameFilter.getRootPaths()[0] +
(preSlash ? "/" : "") + this.newConfigPath + (postSlash ? "/" : "");
+ if ( preSlash ) {
+ this.newConfigPath = this.folderNameFilter.getRootPaths()[0] + "/"
+ this.newConfigPath;
+ } else {
+ this.newConfigPath = this.newConfigPath;
+ }
backgroundThread = new StoppableThread();
backgroundThread.start();
Modified:
sling/trunk/installer/providers/jcr/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1125253&r1=1125252&r2=1125253&view=diff
==============================================================================
---
sling/trunk/installer/providers/jcr/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/trunk/installer/providers/jcr/src/main/resources/OSGI-INF/metatype/metatype.properties
Fri May 20 06:38:50 2011
@@ -46,7 +46,9 @@ sling.jcrinstall.search.path.description
with lower values which represent the same OSGi entity (configuration,
bundle, etc).
sling.jcrinstall.new.config.path.name = New Config Path
-sling.jcrinstall.new.config.path.description = New configurations are stored
at this location.
+sling.jcrinstall.new.config.path.description = New configurations are stored
at this location. If this path \
+ is relative, the resource resolver search path with highest priority is
prepended. Otherwise this path \
+ is used as is.
sling.jcrinstall.enable.writeback.name = Enable Write Back
sling.jcrinstall.enable.writeback.description = Enable writing back of changes
done through other \
