Permalink
Browse files

Version alignining with Karaf 2.3, OSGi 4.3 etc. Removal of dublicate…

… versions.
  • Loading branch information...
1 parent 0c5c5f6 commit d901d64bec5e11acaff2d968aad2eeda25895971 @iocanel iocanel committed Oct 19, 2012
View
@@ -125,7 +125,6 @@
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.1</xalan.version>
<jaxws-api.version>2.2</jaxws-api.version>
- <jettison.version>1.3.1</jettison.version>
<lingo.version>1.3</lingo.version>
<scriptengines.version>1.1</scriptengines.version>
<spring.version>3.0.7.RELEASE</spring.version>
@@ -16,6 +16,7 @@
*/
package org.fusesource.fabric.agent;
+import java.util.Hashtable;
import java.util.Properties;
import org.apache.felix.bundlerepository.impl.RepositoryAdminImpl;
@@ -49,8 +50,8 @@ public void start(BundleContext context) throws Exception {
agent.setStartLevel(getStartLevel(context));
agent.setZkClient(getZkClient(context));
agent.start();
- Properties props = new Properties();
- props.setProperty(Constants.SERVICE_PID, AGENT_PID);
+ Hashtable<String, String> props = new Hashtable<String, String>();
+ props.put(Constants.SERVICE_PID, AGENT_PID);
registration = context.registerService(ManagedService.class.getName(), agent, props);
}
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Hashtable;
import java.util.Properties;
import org.apache.felix.gogo.commands.Argument;
@@ -112,7 +113,7 @@ protected Object doExecute() throws Exception {
installBundles();
}
org.osgi.service.cm.Configuration config = configurationAdmin.getConfiguration("org.fusesource.fabric.zookeeper");
- Properties properties = new Properties();
+ Hashtable<String,Object> properties = new Hashtable<String,Object>();
properties.put("zookeeper.url", zookeeperUrl);
config.setBundleLocation(null);
config.update(properties);
@@ -132,7 +133,7 @@ protected Object doExecute() throws Exception {
return null;
}
org.osgi.service.cm.Configuration config = configurationAdmin.getConfiguration("org.fusesource.fabric.zookeeper");
- Properties properties = new Properties();
+ Hashtable<String,Object> properties = new Hashtable<String,Object>();
properties.put("zookeeper.url", zookeeperUrl);
config.setBundleLocation(null);
config.update(properties);
@@ -25,7 +25,9 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -47,6 +49,7 @@
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.util.tracker.ServiceTracker;
+
import static org.fusesource.fabric.utils.BundleUtils.installOrStopBundle;
import static org.fusesource.fabric.utils.PortUtils.mapPortToRange;
@@ -104,7 +107,7 @@ public void createLocalServer() {
public void createLocalServer(int port) {
try {
IZKClient client;
- Properties properties;
+ Hashtable<String, Object> properties;
String karafName = System.getProperty("karaf.name");
String minimumPort = System.getProperty(ZkDefs.MINIMUM_PORT);
String maximumPort = System.getProperty(ZkDefs.MAXIMUM_PORT);
@@ -128,7 +131,7 @@ public void createLocalServer(int port) {
String autoImportFrom = System.getProperty(PROFILES_AUTOIMPORT_PATH);
Configuration config = configurationAdmin.createFactoryConfiguration("org.fusesource.fabric.zookeeper.server");
- properties = new Properties();
+ properties = new Hashtable<String, Object>();
if (autoImportFrom != null) {
loadPropertiesFrom(properties, autoImportFrom + "/fabric/configs/versions/1.0/profiles/default/org.fusesource.fabric.zookeeper.server.properties");
}
@@ -143,7 +146,7 @@ public void createLocalServer(int port) {
// Update the client configuration
config = configurationAdmin.getConfiguration("org.fusesource.fabric.zookeeper");
- properties = new Properties();
+ properties = new Hashtable<String, Object>();
if (autoImportFrom != null) {
loadPropertiesFrom(properties, autoImportFrom + "/fabric/configs/versions/1.0/profiles/default/org.fusesource.fabric.zookeeper.properties");
}
@@ -243,11 +246,15 @@ public void createLocalServer(int port) {
}
}
- private void loadPropertiesFrom(Properties properties, String from) {
+ private void loadPropertiesFrom(Hashtable hashtable, String from) {
InputStream is = null;
+ Properties properties = new Properties();
try {
is = new FileInputStream(from);
properties.load(is);
+ for (String key : properties.stringPropertyNames()) {
+ hashtable.put(key, properties.get(key));
+ }
} catch (Exception e) {
// Ignore
} finally {
@@ -160,7 +160,7 @@ public void init() throws Exception {
// Service registration
this.registration = this.bundleContext.registerService(new String[] { ListenerHook.class.getName(), EventHook.class.getName(), FindHook.class.getName() }, this, null);
// Check existing services
- ServiceReference[] references = this.bundleContext.getServiceReferences(null, filter);
+ ServiceReference[] references = this.bundleContext.getServiceReferences((String) null, filter);
if (references != null) {
for (ServiceReference reference : references) {
exportService(reference);
@@ -72,7 +72,7 @@ public void testManager() throws Exception {
EasyMock.<String[]>anyObject(),
same(manager),
EasyMock.<Dictionary>same(null))).andReturn(registration);
- expect(bundleContext.getServiceReferences(null, "(service.exported.interfaces=*)")).andReturn(null);
+ expect(bundleContext.getServiceReferences((String) null, "(service.exported.interfaces=*)")).andReturn(null);
replay(bundleContext, registration);
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi-version}</version>
+ <version>${osgi-enterprise-version}</version>
</dependency>
<dependency>
@@ -21,6 +21,7 @@
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -93,7 +94,7 @@ public void testZooKeeper() throws Exception {
ConfigurationAdmin ca = getOsgiService(ConfigurationAdmin.class);
Configuration cfgServer = ca.createFactoryConfiguration("org.fusesource.fabric.zookeeper.server");
- Properties props = new Properties();
+ Hashtable<String, Object> props = new Hashtable<String, Object>();
props.put("tickTime", "2000");
props.put("initLimit", "10");
props.put("syncLimit", "5");
@@ -103,7 +104,7 @@ public void testZooKeeper() throws Exception {
cfgServer.update(props);
Configuration cfgClient = ca.getConfiguration("org.fusesource.fabric.zookeeper");
- props = new Properties();
+ props = new Hashtable<String, Object>();
props.put("zookeeper.url", "localhost:2181");
cfgClient.setBundleLocation(null);
cfgClient.update(props);
@@ -133,8 +133,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -232,7 +230,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.1</version>
+ <version>${jettison.version}</version>
</dependency>
<dependency>
@@ -131,7 +131,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.1</version>
+ <version>${commons-codec-version}</version>
</dependency>
<!-- these are copied to the lib folder -->
@@ -63,12 +63,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>${osgi-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
View
@@ -48,15 +48,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>${osgi-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
View
22 pom.xml
@@ -141,6 +141,7 @@
<jclouds-karaf-version>1.5.2</jclouds-karaf-version>
<jclouds.osgi.version.clean>${jclouds-version}</jclouds.osgi.version.clean>
<jersey-version>1.12</jersey-version>
+ <jettison.version>1.3.1</jettison.version>
<jetty6-version>6.1.26_4</jetty6-version>
<jetty-plugin-version>7.5.4.v20111024</jetty-plugin-version>
<jetty-version>7.5.4.v20111024</jetty-version>
@@ -162,7 +163,7 @@
<maven-fab-plugin-version>1.16</maven-fab-plugin-version>
<maven-jar-plugin-version>2.4</maven-jar-plugin-version>
<maven-resources-plugin-version>2.6</maven-resources-plugin-version>
- <mina-version>2.0.4</mina-version>
+ <mina-version>2.0.5</mina-version>
<mongo-java-driver-version>2.7.3</mongo-java-driver-version>
<mvnplugins-version>1.14</mvnplugins-version>
<ops4j-base.version>1.2.2</ops4j-base.version>
@@ -171,7 +172,8 @@
<ops4j-pax-swissbox-optional-jcl.version>1.3.1</ops4j-pax-swissbox-optional-jcl.version>
<ops4j-pax-web-version>1.0.10</ops4j-pax-web-version>
<org.apache.servicemix.bundles.jzlib.version>1.0.7_1</org.apache.servicemix.bundles.jzlib.version>
- <osgi-version>4.2.0</osgi-version>
+ <osgi-version>4.3.0</osgi-version>
+ <osgi-enterprise-version>4.2.0</osgi-enterprise-version>
<pax-exam-version>2.3.1</pax-exam-version>
<pax.logging.version>1.6.10</pax.logging.version>
<pax-runner-version>1.7.6</pax-runner-version>
@@ -197,7 +199,7 @@
<slf4j-version>1.6.1</slf4j-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-version>3.0.7.RELEASE</spring-version>
- <sshd-version>0.7.0</sshd-version>
+ <sshd-version>0.8.0</sshd-version>
<sshj.version>0.7.0</sshj.version>
<surefire-version>2.12</surefire-version>
<tinybundles-version>1.0.0</tinybundles-version>
@@ -886,7 +888,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi-version}</version>
+ <version>${osgi-enterprise-version}</version>
<scope>provided</scope>
</dependency>
<!-- Camel -->
@@ -1056,7 +1058,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
- <version>1.2.5</version>
+ <version>${pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -1096,6 +1098,16 @@
<version>${hawtdispatch-version}</version>
</dependency>
<dependency>
+ <groupId>org.fusesource.hawtdispatch</groupId>
+ <artifactId>hawtdispatch-transport</artifactId>
+ <version>${hawtdispatch-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.hawtdispatch</groupId>
+ <artifactId>hawtdispatch-scala</artifactId>
+ <version>${hawtdispatch-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>${hawtbuf-version}</version>
@@ -59,14 +59,10 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
</dependency>
-->
<dependency>
@@ -60,14 +60,10 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
</dependency>

0 comments on commit d901d64

Please sign in to comment.