svn commit: r1063175 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config: AbstractConfigTask.java ConfigRemoveTask.java

[cziegeler]

Author: cziegeler
Date: Tue Jan 25 09:10:12 2011
New Revision: 1063175

URL: http://svn.apache.org/viewvc?rev=1063175&view=rev
Log:
Only put alias property if factory configuration

Modified:
    
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java
    
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java

Modified: 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java?rev=1063175&r1=1063174&r2=1063175&view=diff
==============================================================================
--- 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java
 (original)
+++ 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java
 Tue Jan 25 09:10:12 2011
@@ -41,7 +41,7 @@ abstract class AbstractConfigTask extend
     /** Configuration properties to ignore when comparing configs */
     protected static final Set<String> ignoredProperties = new 
HashSet<String>();
     static {
-        ignoredProperties.add("service.pid");
+        ignoredProperties.add(Constants.SERVICE_PID);
         ignoredProperties.add(ConfigTaskCreator.CONFIG_PATH_KEY);
         ignoredProperties.add(ConfigTaskCreator.ALIAS_KEY);
     }
@@ -88,7 +88,9 @@ abstract class AbstractConfigTask extend
         }
 
         result.put(ConfigTaskCreator.CONFIG_PATH_KEY, getResource().getURL());
-        result.put(ConfigTaskCreator.ALIAS_KEY, configPid);
+        if ( this.factoryPid != null ) {
+            result.put(ConfigTaskCreator.ALIAS_KEY, configPid);
+        }
 
         return result;
     }

Modified: 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java?rev=1063175&r1=1063174&r2=1063175&view=diff
==============================================================================
--- 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java
 (original)
+++ 
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java
 Tue Jan 25 09:10:12 2011
@@ -19,8 +19,8 @@
 package org.apache.sling.installer.core.impl.config;
 
 import org.apache.sling.installer.api.tasks.InstallationContext;
-import org.apache.sling.installer.api.tasks.TaskResourceGroup;
 import org.apache.sling.installer.api.tasks.ResourceState;
+import org.apache.sling.installer.api.tasks.TaskResourceGroup;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.util.tracker.ServiceTracker;
@@ -61,7 +61,7 @@ public class ConfigRemoveTask extends Ab
                     this.getLogger().debug("Configuration has not been 
installed by this resource. Not removing!");
                     this.setFinishedState(ResourceState.IGNORED);
                 } else if ( !isSameData(cfg.getProperties(), 
this.getResource().getDictionary()) ) {
-                    this.getLogger().debug("Configuration has changed after is 
has been installed. Not removing!");
+                    this.getLogger().debug("Configuration has changed after it 
has been installed. Not removing!");
                     this.setFinishedState(ResourceState.IGNORED);
                 } else {
                     this.getLogger().debug("Deleting config {} ({})", 
getCompositePid(), getResource());