CSPACE-6168: Need to qualify the database names of the auto-generate Nuxeo repo confi...

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 709974ba7389c370c6e9c3b1c2bb6ee01da3d7fe..c02d9b6755ce7f4ae2e659aa1a526c6b1559b833 100644 (file)
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -121,7 +121,7 @@
            </fileset>\r
         </copy>\r
         <echo message="Copying Nuxeo prototype repo config file ..."/>\r
-        <copy todir="${jee.server.cspace}/cspace/services" overwrite="true">\r
+        <copy todir="${jee.server.cspace}/cspace/config/services" overwrite="true">\r
             <fileset file="${basedir}/nuxeo-server/${nuxeo.release}/config/proto-repo-config.xml"/>\r
             <filterset>\r
                <filter token="DB_NUXEO_NAME" value="${db.nuxeo.name}" />\r

diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
index e42755a33e53a1c64de57f05e34338810d6f1e6f..d8679686b8783717cd7555559e3b8167a09f1aaa 100644 (file)
--- a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
+++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
@@ -8,7 +8,8 @@ public interface JEEServerDeployment {
     final public static String SERVICES_DIR_NAME = "services";
     final public static String CONFIG_DIR_PATH = CONFIG_DIR_NAME + File.separator + SERVICES_DIR_NAME;
     
-    final public static String CSPACE_SERVICES_DIR_PATH = CSPACE_DIR_NAME + File.separator + SERVICES_DIR_NAME;
+    final public static String CSPACE_SERVICES_DIR_PATH = CSPACE_DIR_NAME + File.separator + CONFIG_DIR_NAME +
+               File.separator + SERVICES_DIR_NAME;
 
     final public static String TENANT_BINDINGS_FILENAME_PREFIX = "tenant-bindings";
     final public static String TENANT_BINDINGS_PROTOTYPE_FILENAME = TENANT_BINDINGS_FILENAME_PREFIX + "-proto.xml";

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index 7c43b0e599f14389c13cb8d58f5bdda0a475c274..4281c80956dd1f0e745e94a61abbadd8845209e3 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -386,19 +386,19 @@ public class ServiceMain {
         return serverRootDir;\r
     }\r
 \r
-    public String getCspaceServicesConfigDir() {\r
+    private String getCspaceServicesConfigDir() {\r
         return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_SERVICES_DIR_PATH;\r
     }\r
     \r
-    public String getNuxeoConfigDir() {\r
+    private String getNuxeoConfigDir() {\r
         return getServerRootDir() + File.separator + JEEServerDeployment.NUXEO_SERVER_CONFIG_DIR;\r
     }\r
     \r
-    public String getNuxeoProtoConfigFilename() {\r
+    private String getNuxeoProtoConfigFilename() {\r
         return JEEServerDeployment.NUXEO_PROTOTYPE_CONFIG_FILENAME;\r
     }\r
     \r
-    public String getNuxeoConfigFilename(String reponame) {\r
+    private String getNuxeoConfigFilename(String reponame) {\r
         return reponame + JEEServerDeployment.NUXEO_REPO_CONFIG_FILENAME_SUFFIX;\r
     }\r
     \r
@@ -808,7 +808,7 @@ public class ServiceMain {
                     repositoryConfigDoc = (Document) prototypeConfigDoc.clone();\r
                     // Update this config file by inserting values pertinent to the\r
                     // current repository.\r
-                    repositoryConfigDoc = updateRepositoryConfigDoc(repositoryConfigDoc, repositoryName);\r
+                    repositoryConfigDoc = updateRepositoryConfigDoc(repositoryConfigDoc, repositoryName, this.getCspaceInstanceId());\r
                     if (logger.isTraceEnabled()) {\r
                         logger.trace("Updated Nuxeo repo config file contents=\n" + repositoryConfigDoc.asXML());\r
                     }\r
@@ -824,9 +824,10 @@ public class ServiceMain {
         }\r
     }\r
     \r
-    private Document updateRepositoryConfigDoc(Document repoConfigDoc, String repositoryName) {\r
+    private Document updateRepositoryConfigDoc(Document repoConfigDoc, String repositoryName, String cspaceInstanceId) {\r
+        String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId);\r
+\r
         // FIXME: Remove this temporary placeholder variable used only during development.\r
-        final String PLACEHOLDER = "placeholder";\r
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
                 "/component", "name", String.format("config:%s-repository", repositoryName));\r
         // Text substitutions within first extension point, "repository"\r
@@ -834,24 +835,17 @@ public class ServiceMain {
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName);\r
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository", "name", repositoryName);\r
-//        repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
-//                REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/xa-datasource", PLACEHOLDER);\r
         String url = XmlTools.getElementValue(repoConfigDoc,\r
                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='URL']");\r
         if (! Tools.isBlank(url)) {\r
             repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                     REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='URL']",\r
-                    url + repositoryName);\r
+                    url + databaseName);\r
         }\r
-//        repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
-//                REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='ServerName']", PLACEHOLDER);\r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
-                REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='DatabaseName']", repositoryName);\r
-//        repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
-//                REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='User']", PLACEHOLDER);\r
-//        repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
-//                REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='Password']", PLACEHOLDER);\r
-        // Text substitutions within second extension point, "repositories"\r
+                REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='DatabaseName']",\r
+                databaseName);\r
+        // Text substitutions within second extension point, "repositories" \r
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,\r
                 REPOSITORIES_EXTENSION_POINT_XPATH + "/documentation",\r
                 String.format("The %s repository", repositoryName));\r