You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/02/12 03:08:50 UTC
svn commit: r1659124 - in
/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration:
ConfigurationConstants.java impl/Activator.java impl/ConfigInstallTask.java
package-info.java
Author: cziegeler
Date: Thu Feb 12 02:08:50 2015
New Revision: 1659124
URL: http://svn.apache.org/r1659124
Log:
SLING-4410 : Make default bundle location configurable
Modified:
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/ConfigurationConstants.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/Activator.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/package-info.java
Modified: sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/ConfigurationConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/ConfigurationConstants.java?rev=1659124&r1=1659123&r2=1659124&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/ConfigurationConstants.java (original)
+++ sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/ConfigurationConstants.java Thu Feb 12 02:08:50 2015
@@ -31,7 +31,8 @@ public abstract class ConfigurationConst
/**
* This property defines the value to be used as a bundle location if a configuration
- * is created by the installer. This property is a string value defaulting to "?".
+ * is created by the installer. This property is a string value defaulting either
+ * to {@code null} or "?".
* If this property contains the empty string, {@code null} is used as the value.
*
* The property should be used, if a configuration should be bound to a specific client.
Modified: sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/Activator.java?rev=1659124&r1=1659123&r2=1659124&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/Activator.java (original)
+++ sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/Activator.java Thu Feb 12 02:08:50 2015
@@ -26,13 +26,26 @@ import org.osgi.framework.BundleContext;
*/
public class Activator implements BundleActivator {
+ /** Property for bundle location default. */
+ private static final String PROP_LOCATION_DEFAULT = "sling.installer.config.useMulti";
+
/** Services listener. */
private ServicesListener listener;
+ public static String DEFAULT_LOCATION;
+
/**
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
public void start(final BundleContext context) throws Exception {
+ String locationDefault = null;
+ if ( context.getProperty(PROP_LOCATION_DEFAULT) != null ) {
+ final Boolean bool = Boolean.valueOf(context.getProperty(PROP_LOCATION_DEFAULT).toString());
+ if ( bool.booleanValue() ) {
+ locationDefault = "?";
+ }
+ }
+ DEFAULT_LOCATION = locationDefault;
this.listener = new ServicesListener(context);
}
Modified: sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java?rev=1659124&r1=1659123&r2=1659124&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java (original)
+++ sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java Thu Feb 12 02:08:50 2015
@@ -52,7 +52,7 @@ public class ConfigInstallTask extends A
try {
String location = (String)this.getResource().getDictionary().get(ConfigurationConstants.PROPERTY_BUNDLE_LOCATION);
if ( location == null ) {
- location = "?"; // default
+ location = Activator.DEFAULT_LOCATION; // default
} else if ( location.length() == 0 ) {
location = null;
}
Modified: sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/package-info.java?rev=1659124&r1=1659123&r2=1659124&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/package-info.java (original)
+++ sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/package-info.java Thu Feb 12 02:08:50 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.1.0")
+@Version("1.1.2")
package org.apache.sling.installer.factories.configuration;
import aQute.bnd.annotation.Version;