oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattm...@apache.org
Subject [01/52] [abbrv] oodt git commit: Implemented global configuration publishing mechanism.
Date Wed, 30 Aug 2017 16:39:30 GMT
Repository: oodt
Updated Branches:
  refs/heads/master 7443a7c37 -> fc6311db2


http://git-wip-us.apache.org/repos/asf/oodt/blob/4b88f714/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e55d46c..3b39db0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -247,11 +247,20 @@ the License.
         <artifactId>saxon-dom</artifactId>
         <version>8.7</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.curator</groupId>
         <artifactId>curator-framework</artifactId>
         <version>3.3.0</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.apache.curator</groupId>
+        <artifactId>curator-test</artifactId>
+        <version>3.3.0</version>
+        <scope>test</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>

http://git-wip-us.apache.org/repos/asf/oodt/blob/4b88f714/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
index 996ac16..d43369a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
@@ -108,7 +108,7 @@ public class XmlRpcFileManager {
   /* whether or not to expand a product instance into met */
   private boolean expandProductMet;
 
-  /** Configuration Manager instance which will handle the configiration aspect in distributed/standalone
manner */
+  /** Configuration Manager instance which will handle the configuration aspect in distributed/standalone
manner */
   private ConfigurationManager configurationManager;
 
   /**
@@ -132,9 +132,9 @@ public class XmlRpcFileManager {
 
       List<String> propertiesFiles = new ArrayList<String>();
       propertiesFiles.add(System.getProperty("org.apache.oodt.cas.filemgr.properties"));
-      configurationManager = ConfigurationManagerFactory.getConfigurationManager(componentName,
propertiesFiles,null);
+      configurationManager = ConfigurationManagerFactory.getConfigurationManager(componentName,
propertiesFiles);
     } else {
-      configurationManager = ConfigurationManagerFactory.getConfigurationManager(componentName,null,null);
+      configurationManager = ConfigurationManagerFactory.getConfigurationManager(componentName,null);
     }
 
     this.loadConfiguration();


Mime
View raw message