From ead6a393f1d856dfcc16e0a0adf750328bbfbb9f Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 22 Jul 2014 15:19:31 +0200 Subject: Set members to protected to allow extension. Get properties properly. Use String constants --- .../com/c2kernel/persistency/XMLDBClusterStorage.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java index aec0442..9ed8b7f 100644 --- a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java +++ b/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java @@ -20,8 +20,12 @@ import com.c2kernel.utils.Logger; public class XMLDBClusterStorage extends ClusterStorage { - Database database; - Collection root; + public static final String XMLDB_URI = "XMLDB.URI"; + public static final String XMLDB_USER = "XMLDB.user"; + public static final String XMLDB_PASSWORD = "XMLDB.password"; + public static final String XMLDB_ROOT = "XMLDB.root"; + protected Database database; + protected Collection root; public XMLDBClusterStorage() throws Exception { @@ -69,8 +73,9 @@ public class XMLDBClusterStorage extends ClusterStorage { database = (Database) cl.newInstance(); database.setProperty("create-database", "true"); DatabaseManager.registerDatabase(database); - Collection db = DatabaseManager.getCollection(Gateway.getProperty("XMLDB.URI"), Gateway.getProperty("XMLDB.user"), Gateway.getProperty("XMLDB.password")); - String rootColl = Gateway.getProperty("XMLDB.root"); + Collection db = DatabaseManager.getCollection(Gateway.getProperties().getProperty(XMLDB_URI), + Gateway.getProperties().getProperty(XMLDB_USER), Gateway.getProperties().getProperty(XMLDB_PASSWORD)); + String rootColl = Gateway.getProperties().getProperty(XMLDB_ROOT); if (rootColl != null && rootColl.length()>0) { root = verifyCollection(db, rootColl, true); db.close(); @@ -146,7 +151,7 @@ public class XMLDBClusterStorage extends ClusterStorage { if (resource != null) { String objString = (String)resource.getContent(); itemColl.close(); - if (type.equals("Outcome")) + if (type.equals(OUTCOME)) return new Outcome(path, objString); else { C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(objString); -- cgit v1.2.3