You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 13:23:05 UTC
[30/50] [abbrv] git commit: [KARAF-2318] Exclude service.factoryPid
property from the Cellar sync
[KARAF-2318] Exclude service.factoryPid property from the Cellar sync
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/trunk@1483677 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/33ab36cf
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/33ab36cf
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/33ab36cf
Branch: refs/heads/master
Commit: 33ab36cf60baa4a34b7d63d9a605c2bd54bc87e4
Parents: 8a85ea7
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri May 17 07:46:31 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri May 17 07:46:31 2013 +0000
----------------------------------------------------------------------
.../java/org/apache/karaf/cellar/config/ConfigurationSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/33ab36cf/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
index fa6f986..f33d367 100644
--- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
+++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
@@ -28,7 +28,7 @@ import java.util.*;
*/
public class ConfigurationSupport extends CellarSupport {
- private static String[] EXCLUDED_PROPERTIES = {"felix.fileinstall.filename", "felix.fileinstall.dir", "felix.fileinstall.tmpdir", "org.ops4j.pax.url.mvn.defaultRepositories"};
+ private static String[] EXCLUDED_PROPERTIES = {"service.factoryPid", "felix.fileinstall.filename", "felix.fileinstall.dir", "felix.fileinstall.tmpdir", "org.ops4j.pax.url.mvn.defaultRepositories"};
private static final String FELIX_FILEINSTALL_FILENAME = "felix.fileinstall.filename";