Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase
In directory
james.mmbase.org:/tmp/cvs-serv16045/cmsc/utilities/src/java/com/finalist/cmsc/mmbase
Modified Files:
PropertiesUtil.java
Log Message:
CMSC-1330 Upgrade CMSc to use MMBase 1.9
We do not support org.mmbase.systemproperties yet, but we should when we go 1.9
all the way
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase
See also: http://www.mmbase.org/jira/browse/CMSC-1330
Index: PropertiesUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/PropertiesUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- PropertiesUtil.java 22 Jan 2009 14:32:57 -0000 1.11
+++ PropertiesUtil.java 10 Apr 2009 11:28:22 -0000 1.12
@@ -150,7 +150,7 @@
private static Node getPropertyNodes(Cloud cloud, String propertyKey) {
- NodeManager propertiesManager = cloud.getNodeManager("properties");
+ NodeManager propertiesManager = getPropertiesNodeManager(cloud);
NodeQuery query = propertiesManager.createQuery();
Field keyField = propertiesManager.getField("key");
FieldValueConstraint constraint =
query.createConstraint((query.getStepField(keyField)),
@@ -164,7 +164,6 @@
return null;
}
-
private static boolean isServerInEnv(String machineName, String servers) {
String[] serversArray = servers.split(",");
for (String element : serversArray) {
@@ -208,7 +207,7 @@
public static void setProp(Cloud cloud, String key, String value) {
- NodeManager propertiesManager = cloud.getNodeManager("properties");
+ NodeManager propertiesManager = getPropertiesNodeManager(cloud);
Node property = getPropertyNodes(cloud, key);
if (property == null) {
property = propertiesManager.createNode();
@@ -224,7 +223,7 @@
public static Map<String, String> getModuleProperties(String module) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Map<String, String> result = new TreeMap<String, String>();
- NodeManager propertiesManager = cloud.getNodeManager("properties");
+ NodeManager propertiesManager = getPropertiesNodeManager(cloud);
NodeQuery query = propertiesManager.createQuery();
Field keyField = propertiesManager.getField("module");
FieldValueConstraint constraint =
query.createConstraint((query.getStepField(keyField)),
@@ -240,4 +239,11 @@
return result;
}
+ private static NodeManager getPropertiesNodeManager(Cloud cloud) {
+// if (cloud.hasNodeManager("systemproperties")) {
+// return cloud.getNodeManager("systemproperties");
+// }
+ return cloud.getNodeManager("properties");
+ }
+
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
