From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 6 Mar 2014 23:37:00 +0000 (-0800)
Subject: Merge branch 'CSPACE-6329' into CSPACE-6329-A. This merges in Aron's CSPACE-6329... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6b5f2545f922f9e9116e87c08d56ad3262df30a2;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-6329' into CSPACE-6329-A. This merges in Aron's CSPACE-6329 changes into Richard's CSPACE-6168-REM-A branch.

Conflicts:
	3rdparty/nuxeo/build.xml
	build.properties
	services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
---

6b5f2545f922f9e9116e87c08d56ad3262df30a2
diff --cc 3rdparty/nuxeo/build.xml
index d96505b20,45d8a54a4..3ec8b9073
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@@ -116,20 -116,13 +116,26 @@@
      <target name="deploy" depends="package"
      	description="deploy nuxeo server libs to ${jee.server.cspace}">
          <copy todir="${jee.server.cspace}/nuxeo-server">
+            <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}">
+                 <exclude name="**/config/*-repo-config.xml"/>
+            </fileset>
 +           <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>
 +        </copy>
 +        <copy todir="${jee.server.cspace}/nuxeo-server/config" overwrite="true">
 +            <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}/config"/>
 +            <filterset>
 +                <filter token="DB" value="${db}" />
 +				<filter token="DB_NUXEO_NAME" value="${db.nuxeo.name}" />
 +				<filter token="DB_URL" value="jdbc:${db}://${db.host}:${db.port}/${db.nuxeo.name}"/>
 +            	<filter token="DB_SERVER_HOSTNAME" value="${db.host}"/>
 +				<filter token="XA_DATASOURCE" value="${db.xaDataSource}" />
 +                <filter token="NUXEO_USER" value="${db.nuxeo.user}" />
 +                <filter token="NUXEO_PW" value="${db.nuxeo.user.password}" />
 +            </filterset>
          </copy>
+         <echo message="Copying Nuxeo prototype repo config file ..."/>
+         <copy file="${basedir}/nuxeo-server/${nuxeo.release}/config/proto-repo-config.xml"
+             todir="${jee.server.cspace}/cspace/services" overwrite="true"/>
          <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>
          <ant antfile="nuxeo-platform-listener/build.xml" target="deploy" inheritall="false"/>
  				<!-- Disabled due to integration issues between ImageMagick and Ghostscript on Linux systems        
diff --cc services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index bc965f27c,90b643f7e..80e7d7698
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@@ -18,6 -19,9 +18,8 @@@ import javax.servlet.ServletContext
  import javax.sql.DataSource;
  
  import org.collectionspace.authentication.AuthN;
 -
+ import org.collectionspace.services.common.api.JEEServerDeployment;
+ import org.collectionspace.services.common.api.Tools;
  import org.collectionspace.services.common.authorization_mgt.AuthorizationCommon;
  import org.collectionspace.services.common.config.ConfigReader;
  import org.collectionspace.services.common.config.ConfigUtils;
@@@ -38,7 -42,9 +40,7 @@@ import org.collectionspace.services.con
  import org.collectionspace.services.nuxeo.client.java.NuxeoConnectorEmbedded;
  import org.collectionspace.services.nuxeo.client.java.TenantRepository;
  import org.jboss.resteasy.spi.ResteasyProviderFactory;
- import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
 -
+ import org.dom4j.Document;
 -
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@@ -67,7 -69,15 +69,13 @@@ public class ServiceMain 
      private TenantBindingConfigReaderImpl tenantBindingConfigReader;
      private UriTemplateRegistry uriTemplateRegistry = new UriTemplateRegistry();
      
 -    private static final String SERVER_HOME_PROPERTY = "catalina.home";
 -    private static final boolean USE_APP_GENERATED_CONFIG = true;
      
+     private static final String COMPONENT_EXTENSION_XPATH = "/component/extension[@point='%s']";
+     private static final String REPOSITORY_EXTENSION_POINT_XPATH =
+             String.format(COMPONENT_EXTENSION_XPATH, "repository");
+     private static final String REPOSITORIES_EXTENSION_POINT_XPATH =
+             String.format(COMPONENT_EXTENSION_XPATH, "repositories");
+             
      private ServiceMain() {
      	//empty
      }
@@@ -134,23 -142,30 +142,23 @@@
      }
  
      private void initialize() throws Exception {
 -    	if (logger.isTraceEnabled() == true)     	{
 -    		System.out.print("About to initialize ServiceMain singleton - Pausing 5 seconds for you to attached the debugger");
 -    		long startTime, currentTime;
 -    		currentTime = startTime = System.currentTimeMillis();
 -    		long stopTime = startTime + 5 * 1000; //5 seconds
 -    		do {
 -    			if (currentTime % 1000 == 0) {
 -    				System.out.print(".");
 -    			}
 -    			currentTime = System.currentTimeMillis();
 -    		} while (currentTime < stopTime);
 -    			
 -    		System.out.println();
 -    		System.out.println("Resuming cspace services initialization.");
 -    	}
 -    	
 +    	// set our root directory
      	setServerRootDir();
 -        readConfig();
 -    	setDataSources();
 +    	
 +    	// read in and set our Services config
 +    	readAndSetServicesConfig();
 +    	
 +    	// Set our AuthN's datasource to for the cspaceDataSource
 +    	AuthN.setDataSource(JDBCTools.getDataSource(JDBCTools.CSPACE_DATASOURCE_NAME));
 +    	
 +    	// Please document this step
          propagateConfiguredProperties();
-         
-         // Create each tenant's Nuxeo database
+         createOrUpdateNuxeoRepositoryConfigFiles();
+                 
 +    	createNuxeoDatabases();
 +
          //
 -        // Start up and initialize our embedded Nuxeo server instance
 +        // Start up and initialize our embedded Nuxeo instance.
          //
          if (getClientType().equals(ClientType.JAVA)) {
              nuxeoConnector = NuxeoConnectorEmbedded.getInstance();
@@@ -722,4 -759,103 +746,101 @@@
          }
          return uriTemplateRegistry;
      }
 -
+    /**
+     * Ensure that Nuxeo repository configuration files exist for each repository
+     * specified in tenant bindings. Create or update these files, as needed.
+     */
+     private void createOrUpdateNuxeoRepositoryConfigFiles() throws Exception {
+         
+         // Get the prototype copy of the Nuxeo repository config file.
+         File prototypeNuxeoConfigFile =
+                 new File(getCspaceServicesConfigDir() + File.separator + getNuxeoProtoConfigFilename());
+         // FIXME: Consider checking for the presence of existing configuration files,
+         // rather than always failing outright if the prototype file for creating
+         // new or updated files can't be located.
+         if (! prototypeNuxeoConfigFile.canRead()) {
+             String msg = String.format("Could not find and/or read the prototype Nuxeo config file '%s'",
+                     prototypeNuxeoConfigFile.getCanonicalPath());
+             throw new RuntimeException(msg);
+         }
+         if (logger.isTraceEnabled()) {
+             logger.trace("Found and can read prototype Nuxeo config file at path %s", prototypeNuxeoConfigFile.getAbsolutePath());
+         }
+         Document prototypeConfigDoc = XmlTools.fileToXMLDocument(prototypeNuxeoConfigFile);
+         Document repositoryConfigDoc = null;
+         // FIXME: Can the variable below reasonably be made a class variable? Its value
+         // is used in at least one other method in this class.
+         Hashtable<String, TenantBindingType> tenantBindingTypeMap = tenantBindingConfigReader.getTenantBindings();
+         for (TenantBindingType tbt : tenantBindingTypeMap.values()) {
+             List<String> repositoryNameList = ConfigUtils.getRepositoryNameList(tbt);
+             if (logger.isTraceEnabled()) {
+                 logger.trace("Getting repository name(s) for tenant " + tbt.getName());
+             }
+             if (repositoryNameList == null || repositoryNameList.isEmpty() == true) {
+               logger.warn(String.format("Could not get repository name(s) for tenant %s", tbt.getName()));
+               continue;
+             } else {
+                 for (String repositoryName : repositoryNameList) {
+                     if (Tools.isBlank(repositoryName)) {
+                         continue;
+                     }
+                     if (logger.isTraceEnabled()) {
+                         logger.trace(String.format("Repository name is %s", repositoryName));
+                     }
+                     // FIXME: As per above, we might check for the presence of an existing
+                     // config file for this repository and, if present, not fail even if
+                     // the code below fails to update that file on any given system startup.
+                     //
+                     // Clone the prototype copy of the Nuxeo repository config file,
+                     // thus creating a separate config file for the current repository.
+                     repositoryConfigDoc = (Document) prototypeConfigDoc.clone();
+                     // Update this config file by inserting values pertinent to the
+                     // current repository.
+                     repositoryConfigDoc = updateRepositoryConfigDoc(repositoryConfigDoc, repositoryName);
+                     if (logger.isTraceEnabled()) {
+                         logger.trace("Updated Nuxeo repo config file contents=\n" + repositoryConfigDoc.asXML());
+                     }
+                     // Write this config file to the Nuxeo server config directory.
+                     File repofile = new File(getNuxeoConfigDir() + File.separator +
+                             repositoryName + JEEServerDeployment.NUXEO_REPO_CONFIG_FILENAME_SUFFIX);
+                     if (logger.isTraceEnabled()) {
+                         logger.trace(String.format("Attempting to write Nuxeo repo config file to %s", repofile.getAbsolutePath()));
+                     }
+                     XmlTools.xmlDocumentToFile(repositoryConfigDoc, repofile);
+                 }
+             }
+         }
+     }
+     
+     private Document updateRepositoryConfigDoc(Document repoConfigDoc, String repositoryName) {
+         // FIXME: Remove this temporary placeholder variable used only during development.
+         final String PLACEHOLDER = "placeholder";
+         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
+                 "/component", "name", String.format("config:%s-repository", repositoryName));
+         // Text substitutions within first extension point, "repository"
+         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName);
+         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository", "name", repositoryName);
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/xa-datasource", PLACEHOLDER);
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='URL']", PLACEHOLDER);
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='ServerName']", PLACEHOLDER);
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='DatabaseName']", repositoryName);
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='User']", PLACEHOLDER);
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORY_EXTENSION_POINT_XPATH + "/repository/repository/property[@name='Password']", PLACEHOLDER);
+         // Text substitutions within second extension point, "repositories"
+         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
+                 REPOSITORIES_EXTENSION_POINT_XPATH + "/documentation", PLACEHOLDER);
+         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
+                 REPOSITORIES_EXTENSION_POINT_XPATH + "/repository", "name", repositoryName);
+         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
+                 REPOSITORIES_EXTENSION_POINT_XPATH + "/repository", "label", PLACEHOLDER);
+         return repoConfigDoc;
+     }
 -
  }