You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:42:27 UTC
[sling-org-apache-sling-installer-factory-configuration] 03/11:
SLING-2004 : Don't add org.apache.sling.installer.osgi.path property to
configurations
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 02525eb6e79e29bd1a435efb0ddf7f16b4f33f5c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Mar 1 10:49:50 2011 +0000
SLING-2004 : Don't add org.apache.sling.installer.osgi.path property to configurations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1075771 13f79535-47bb-0310-9956-ffa450edef68
---
.../factories/configuration/impl/AbstractConfigTask.java | 1 -
.../installer/factories/configuration/impl/ConfigRemoveTask.java | 5 +----
.../installer/factories/configuration/impl/ConfigTaskCreator.java | 1 -
.../sling/installer/factories/configuration/impl/ConfigUtil.java | 8 +++++++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
index 011e193..69081b7 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
@@ -84,7 +84,6 @@ abstract class AbstractConfigTask extends InstallTask {
result.put(key, d.get(key));
}
- result.put(ConfigTaskCreator.CONFIG_PATH_KEY, getResource().getURL());
if ( this.factoryPid != null ) {
result.put(ConfigTaskCreator.ALIAS_KEY, configPid);
}
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
index 78050b4..0db55de 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
@@ -52,10 +52,7 @@ public class ConfigRemoveTask extends AbstractConfigTask {
this.getLogger().debug("Cannot delete config , pid={} not found, ignored ({})", getCompositePid(), getResource());
this.setFinishedState(ResourceState.IGNORED);
} else {
- if ( cfg.getProperties().get(ConfigTaskCreator.CONFIG_PATH_KEY) == null ) {
- this.getLogger().debug("Configuration has not been installed by this resource. Not removing!");
- this.setFinishedState(ResourceState.IGNORED);
- } else if ( !ConfigUtil.isSameData(cfg.getProperties(), this.getResource().getDictionary()) ) {
+ if ( !ConfigUtil.isSameData(cfg.getProperties(), this.getResource().getDictionary()) ) {
this.getLogger().debug("Configuration has changed after it has been installed. Not removing!");
this.setFinishedState(ResourceState.IGNORED);
} else {
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index 535b5f8..e5c1551 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -45,7 +45,6 @@ public class ConfigTaskCreator
implements InstallTaskFactory, ConfigurationListener, ResourceTransformer {
public static final String ALIAS_KEY = "org.apache.sling.installer.osgi.factoryaliaspid";
- public static final String CONFIG_PATH_KEY = "org.apache.sling.installer.osgi.path";
/** Configuration admin. */
private ConfigurationAdmin configAdmin;
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
index 321bdd9..d956589 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
@@ -35,11 +35,17 @@ import org.osgi.service.cm.ConfigurationAdmin;
*/
abstract class ConfigUtil {
+ /**
+ * This property has been used in older versions to keep track where the
+ * configuration has been installed from.
+ */
+ private static final String CONFIG_PATH_KEY = "org.apache.sling.installer.osgi.path";
+
/** Configuration properties to ignore when comparing configs */
private static final Set<String> IGNORED_PROPERTIES = new HashSet<String>();
static {
IGNORED_PROPERTIES.add(Constants.SERVICE_PID);
- IGNORED_PROPERTIES.add(ConfigTaskCreator.CONFIG_PATH_KEY);
+ IGNORED_PROPERTIES.add(CONFIG_PATH_KEY);
IGNORED_PROPERTIES.add(ConfigTaskCreator.ALIAS_KEY);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.