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 2012/10/16 16:45:26 UTC
svn commit: r1398825 - in /karaf/cellar/branches/cellar-2.3.x: ./
bundle/src/main/java/org/apache/karaf/cellar/bundle/ config/
config/src/main/java/org/apache/karaf/cellar/config/
features/src/main/java/org/apache/karaf/cellar/features/ obr/src/main/ja...
Author: jbonofre
Date: Tue Oct 16 14:45:25 2012
New Revision: 1398825
URL: http://svn.apache.org/viewvc?rev=1398825&view=rev
Log:
Begin Karaf 2.3.x support
Modified:
karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/config/pom.xml
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java
karaf/cellar/branches/cellar-2.3.x/pom.xml
Modified: karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java Tue Oct 16 14:45:25 2012
@@ -165,10 +165,10 @@ public class BundleSynchronizer extends
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
- Dictionary<String, String> properties = configuration.getProperties();
+ Dictionary<String, Object> properties = configuration.getProperties();
if (properties != null) {
String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
- String propertyValue = properties.get(propertyKey);
+ String propertyValue = (String) properties.get(propertyKey);
result = Boolean.parseBoolean(propertyValue);
}
} catch (IOException e) {
Modified: karaf/cellar/branches/cellar-2.3.x/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/pom.xml?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/pom.xml Tue Oct 16 14:45:25 2012
@@ -50,7 +50,7 @@
org.apache.karaf.cellar.config*;version="${project.version}"
</osgi.export>
<osgi.private>
- org.apache.karaf.util;-split-package:=merge-first,
+ org.apache.felix.utils*;-split-package:=merge-first,
!*
</osgi.private>
</properties>
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java Tue Oct 16 14:45:25 2012
@@ -13,6 +13,7 @@
*/
package org.apache.karaf.cellar.config;
+import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.cellar.core.CellarSupport;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -21,7 +22,9 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Enumeration;
/**
* Configuration support.
@@ -97,7 +100,7 @@ public class ConfigurationSupport extend
throw (IOException) new IOException(e.getMessage()).initCause(e);
}
}
- org.apache.karaf.util.Properties p = new org.apache.karaf.util.Properties(storageFile);
+ Properties p = new Properties(storageFile);
for (Enumeration keys = props.keys(); keys.hasMoreElements(); ) {
Object key = keys.nextElement();
if (!org.osgi.framework.Constants.SERVICE_PID.equals(key)
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Tue Oct 16 14:45:25 2012
@@ -161,10 +161,10 @@ public class ConfigurationSynchronizer e
String groupName = group.getName();
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
- Dictionary<String, String> properties = configuration.getProperties();
+ Dictionary<String, Object> properties = configuration.getProperties();
if (properties != null) {
String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
- String propertyValue = properties.get(propertyKey);
+ String propertyValue = (String) properties.get(propertyKey);
result = Boolean.parseBoolean(propertyValue);
}
} catch (IOException e) {
Modified: karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Tue Oct 16 14:45:25 2012
@@ -177,10 +177,10 @@ public class FeaturesSynchronizer extend
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
- Dictionary<String, String> properties = configuration.getProperties();
+ Dictionary<String, Object> properties = configuration.getProperties();
if (properties != null) {
String propertyKey = groupName + Configurations.SEPARATOR + Constants.FEATURES_CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
- String propertyValue = properties.get(propertyKey);
+ String propertyValue = (String) properties.get(propertyKey);
result = Boolean.parseBoolean(propertyValue);
}
} catch (IOException e) {
Modified: karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrListUrlCommand.java Tue Oct 16 14:45:25 2012
@@ -19,7 +19,6 @@ import org.apache.karaf.cellar.core.Conf
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
import org.apache.karaf.cellar.obr.Constants;
-import org.apache.karaf.jaas.modules.GroupPrincipal;
import java.util.Set;
Modified: karaf/cellar/branches/cellar-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/pom.xml?rev=1398825&r1=1398824&r2=1398825&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/pom.xml Tue Oct 16 14:45:25 2012
@@ -44,7 +44,7 @@
<joda-time.version>2.1</joda-time.version>
<junit.version>4.7</junit.version>
<junit.bundle.version>4.7_3</junit.bundle.version>
- <karaf.version>2.3.0-SNAPSHOT</karaf.version>
+ <karaf.version>2.3.0</karaf.version>
<osgi.version>4.3.0</osgi.version>
<pax.exam.version>2.3.1</pax.exam.version>
<pax.exam.karaf.version>0.5.3</pax.exam.karaf.version>