change 'index.d1node.baseURL'->'dataone.mn.baseURL'

DataONEorg · Mar 21, 2024 · 3158ce5 · 3158ce5
1 parent 4b26efd
commit 3158ce5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/helm/config/dataone-indexer.properties b/helm/config/dataone-indexer.properties
@@ -1,4 +1,4 @@
-index.d1node.baseURL={{ include "idxworker.mn.url" . }}
+dataone.mn.baseURL={{ include "idxworker.mn.url" . }}
 index.data.root.directory={{ .Values.idxworker.data_directory }}
 index.document.root.directory={{ .Values.idxworker.document_directory }}
 index.tdb.directory={{ .Values.idxworker.tripleDbDirectory }}

diff --git a/src/main/java/org/dataone/cn/indexer/object/ObjectManager.java b/src/main/java/org/dataone/cn/indexer/object/ObjectManager.java
@@ -58,7 +58,7 @@ public class ObjectManager {
     private static ObjectManager manager = null;
     private static String dataRootDir = Settings.getConfiguration().getString("index.data.root.directory");
     private static String documentRootDir = Settings.getConfiguration().getString("index.document.root.directory");
-    private static String nodeBaseURL = Settings.getConfiguration().getString("index.d1node.baseURL");
+    private static String nodeBaseURL = Settings.getConfiguration().getString("dataone.mn.baseURL");
     private static String DataONEauthToken = null;
     private static Logger logger = Logger.getLogger(ObjectManager.class);
     private static final String TOKEN_VARIABLE_NAME = "DATAONE_AUTH_TOKEN";

diff --git a/src/main/resources/org/dataone/configuration/index-processor.properties b/src/main/resources/org/dataone/configuration/index-processor.properties
@@ -1,5 +1,5 @@
-#index.d1node.baseURL=https://dev.nceas.ucsb.edu/knb/d1/mn
-index.d1node.baseURL=https://valley.duckdns.org/metacat/d1/mn
+#dataone.mn.baseURL=https://dev.nceas.ucsb.edu/knb/d1/mn
+dataone.mn.baseURL=https://valley.duckdns.org/metacat/d1/mn
 index.data.root.directory=/var/metacat/data
 index.document.root.directory=/var/metacat/documents
 

diff --git a/src/test/java/org/dataone/cn/indexer/IndexWorkerTest.java b/src/test/java/org/dataone/cn/indexer/IndexWorkerTest.java
@@ -153,7 +153,7 @@ public void testLoadAdditionalPropertiesFile() throws Exception {
         File defaultFile = new File (propertyFilePath);
         //The one from the user specified location
         assertTrue(IndexWorker.propertyFilePath.equals(propertyFilePath));
-        assertTrue(Settings.getConfiguration().getString("index.d1node.baseURL").
+        assertTrue(Settings.getConfiguration().getString("dataone.mn.baseURL").
                 equals("https://valley.duckdns.org/metacat/d1/mn"));
         assertTrue(Settings.getConfiguration().
                 getString("index.data.root.directory").equals("/var/metacat/data"));
@@ -164,7 +164,7 @@ public void testLoadAdditionalPropertiesFile() throws Exception {
         String propertyFilePath2 = "./src/test/resources/org/dataone/configuration/index-processor-2.properties";
         IndexWorker.loadAdditionalPropertyFile(propertyFilePath2);
         assertTrue(IndexWorker.propertyFilePath.equals(propertyFilePath));
-        assertTrue(Settings.getConfiguration().getString("index.d1node.baseURL").
+        assertTrue(Settings.getConfiguration().getString("dataone.mn.baseURL").
                 equals("https://valley.duckdns.org/metacat/d1/mn"));
         assertTrue(Settings.getConfiguration().
                 getString("index.data.root.directory").equals("/objects"));

diff --git a/src/test/resources/org/dataone/configuration/index-processor-2.properties b/src/test/resources/org/dataone/configuration/index-processor-2.properties
@@ -1,5 +1,5 @@
-#index.d1node.baseURL=https://dev.nceas.ucsb.edu/knb/d1/mn
-index.d1node.baseURL=https://valley.duckdns.org/metacat/d1/mn
+#dataone.mn.baseURL=https://dev.nceas.ucsb.edu/knb/d1/mn
+dataone.mn.baseURL=https://valley.duckdns.org/metacat/d1/mn
 index.data.root.directory=/objects
 index.document.root.directory=/objects
 

diff --git a/src/test/resources/org/dataone/configuration/index-processor.properties b/src/test/resources/org/dataone/configuration/index-processor.properties
@@ -1,5 +1,5 @@
-#index.d1node.baseURL=https://dev.nceas.ucsb.edu/knb/d1/mn
-index.d1node.baseURL=https://valley.duckdns.org/metacat/d1/mn
+#dataone.mn.baseURL=https://dev.nceas.ucsb.edu/knb/d1/mn
+dataone.mn.baseURL=https://valley.duckdns.org/metacat/d1/mn
 index.data.root.directory=/
 index.document.root.directory=/