You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2013/02/18 11:00:41 UTC
svn commit: r1447176 - in /ace/trunk/org.apache.ace.managementagent: bnd.bnd
src/org/apache/ace/managementagent/Activator.java
Author: marrs
Date: Mon Feb 18 10:00:41 2013
New Revision: 1447176
URL: http://svn.apache.org/r1447176
Log:
ACE-336 We embedded an old version of the API with a newer version of the CM implementation. That caused CNFE. Now reversed the order on the build path and fixed a compiler error because of it.
Modified:
ace/trunk/org.apache.ace.managementagent/bnd.bnd
ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java
Modified: ace/trunk/org.apache.ace.managementagent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.managementagent/bnd.bnd?rev=1447176&r1=1447175&r2=1447176&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.managementagent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.managementagent/bnd.bnd Mon Feb 18 10:00:41 2013
@@ -1,10 +1,10 @@
-buildpath: \
osgi.core,\
- osgi.cmpn,\
org.apache.felix.configadmin,\
org.apache.felix.dependencymanager,\
org.apache.felix.deploymentadmin,\
org.apache.felix.eventadmin,\
+ osgi.cmpn,\
org.apache.ace.connectionfactory;version=latest,\
org.apache.ace.consolelogger;version=latest,\
org.apache.ace.gateway.log;version=latest,\
Modified: ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java?rev=1447176&r1=1447175&r2=1447176&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java (original)
+++ ace/trunk/org.apache.ace.managementagent/src/org/apache/ace/managementagent/Activator.java Mon Feb 18 10:00:41 2013
@@ -4,6 +4,8 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Properties;
import org.apache.felix.dm.DependencyActivatorBase;
@@ -216,13 +218,16 @@ public class Activator extends Dependenc
for (File f : file.listFiles()) {
loadProperties(factoryPid, f);
}
- } else {
+ }
+ else {
loadProperties(factoryPid, file);
}
- } else {
+ }
+ else {
loadProperties(factoryPid, new URL(value));
}
- } catch (IOException e) {
+ }
+ catch (IOException e) {
System.err.println("Invalid authentication properties for " + value + " (" + e.getMessage() + ")");
}
}
@@ -236,9 +241,7 @@ public class Activator extends Dependenc
Properties props = new Properties();
props.load(url.openStream());
-
- conf.update(props);
-
+ conf.update((Dictionary<String, ?>) ((Hashtable) props));
return props;
}
}