From d95b2458ebb9f0136df07a237a1c2c04ccfc8c8d Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Mon, 2 Apr 2012 16:08:50 -0700
Subject: [PATCH] CSPACE-4963 Building up test cases with lifesci tenant. Also
 split up the create_db target in ant to make it faster to develop and test
 schema changes.

---
 build.xml                                     | 28 ++++++--
 installer/build.xml                           | 49 +++++++++----
 .../collectionobject/lifesci_extended_co.xml  | 45 ++++++++++++
 .../lifesci_extended_injectedco.xml           | 50 ++++++++++++++
 services/account/build.xml                    |  4 +-
 services/account/pstore/build.xml             |  2 +-
 services/authentication/build.xml             |  4 +-
 services/authentication/pstore/build.xml      |  2 +-
 services/authorization-mgt/build.xml          |  2 +-
 services/authorization/build.xml              |  4 +-
 services/authorization/pstore/build.xml       |  2 +-
 services/build.xml                            | 14 ++--
 .../collectionobjects_naturalhistory.xsd      | 25 ++++---
 services/id/build.xml                         |  4 +-
 services/id/service/build.xml                 |  2 +-
 .../resources/db/mysql/init_cspace_db.sql     | 24 +++++++
 .../mysql/{init_db.sql => init_nuxeo_db.sql}  | 68 +++++++------------
 .../db/postgresql/init_cspace_db.sql          | 11 +++
 .../{init_db.sql => init_nuxeo_db.sql}        | 50 +++++++-------
 19 files changed, 274 insertions(+), 116 deletions(-)
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml
 create mode 100644 src/main/resources/db/mysql/init_cspace_db.sql
 rename src/main/resources/db/mysql/{init_db.sql => init_nuxeo_db.sql} (57%)
 create mode 100644 src/main/resources/db/postgresql/init_cspace_db.sql
 rename src/main/resources/db/postgresql/{init_db.sql => init_nuxeo_db.sql} (69%)

diff --git a/build.xml b/build.xml
index 5c854c156..7d47c8650 100644
--- a/build.xml
+++ b/build.xml
@@ -205,24 +205,42 @@
 		<ant antfile="services/build.xml" target="gen_ddl" inheritAll="false"/>
 	</target>
 
-	<target name="create_db" depends="create_base_db"
+	<target name="create_db" 
             description="create database(s), invoke subtasks for indexes, etc.">
-		<ant antfile="services/build.xml" target="create_db" inheritAll="false"/>
+		<antcall target="create_nuxeo_db"/>
+		<antcall target="create_cspace_db"/>
 	</target>
 
-	<target name="create_base_db" 
-            description="create database(s), grant privileges to test users">
+	<target name="create_nuxeo_db" 
+            description="create nuxeo database">
 		<sql driver="${db.jdbc.driver.class}"
              url="${db.jdbc.baseurl}"
              userid="${db.user}"
              password="${db.user.password}"
 						 autocommit="true"
-             src="${db.script.dir}/init_db.sql"
+             src="${db.script.dir}/init_nuxeo_db.sql"
              >
 			<classpath>
 				<pathelement path="${db.driver.jar}"/>
 			</classpath>
 		</sql>
+		<ant antfile="services/build.xml" target="create_nuxeo_db" inheritAll="false"/>
+	</target>
+
+	<target name="create_cspace_db" 
+		description="create cspace database">
+		<sql driver="${db.jdbc.driver.class}"
+             url="${db.jdbc.baseurl}"
+             userid="${db.user}"
+             password="${db.user.password}"
+						 autocommit="true"
+             src="${db.script.dir}/init_cspace_db.sql"
+             >
+			<classpath>
+				<pathelement path="${db.driver.jar}"/>
+			</classpath>
+		</sql>
+		<ant antfile="services/build.xml" target="create_cspace_db" inheritAll="false"/>
 	</target>
 
 	<target name="import"
diff --git a/installer/build.xml b/installer/build.xml
index 066cf84d3..b04c1c49d 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -52,23 +52,44 @@
 				<ant antfile="services/build.xml" target="config" inheritAll="false"/>        
     </target>    
     
-    <target name="predeploy" depends="config">
-        <exec executable="echo">
-        		<arg value="Installer: Creating necessary databases and associated users and privileges." />
-				</exec>
-        <sql driver="${db.jdbc.driver.class}"
-        url="${db.jdbc.baseurl}"
-        userid="${db.user}"
-        password="${db.user.password}"
-        src="${db.script.dir}/init_db.sql">
-            <classpath>
-                <pathelement path="${db.driver.jar}"/>
-            </classpath>
-        </sql>
-				
+    <target name="predeploy" depends="config, create_cspace_db, create_nuxeo_db">
 				<!-- Now, invoke the "predeploy" target on each of the services' install directories -->
         <ant antfile="services/build.xml" target="predeploy" inheritAll="false"/>        	
     </target>
+
+		<target name="create_nuxeo_db" 
+							description="create nuxeo database">
+			<sql driver="${db.jdbc.driver.class}"
+							 url="${db.jdbc.baseurl}"
+							 userid="${db.user}"
+							 password="${db.user.password}"
+							 autocommit="true"
+							 src="${db.script.dir}/init_nuxeo_db.sql"
+							 >
+				<classpath>
+					<pathelement path="${db.driver.jar}"/>
+				</classpath>
+			</sql>
+		<ant antfile="services/build.xml" target="create_nuxeo_db" inheritAll="false"/>
+		</target>
+
+		<target name="create_cspace_db" 
+			description="create cspace database">
+			<sql driver="${db.jdbc.driver.class}"
+							 url="${db.jdbc.baseurl}"
+							 userid="${db.user}"
+							 password="${db.user.password}"
+							 autocommit="true"
+							 src="${db.script.dir}/init_cspace_db.sql"
+							 >
+				<classpath>
+					<pathelement path="${db.driver.jar}"/>
+				</classpath>
+			</sql>
+		<ant antfile="services/build.xml" target="create_cspace_db" inheritAll="false"/>
+		</target>
+
+
     
     <target name="deploy" description="">
 				<!-- Now, invoke the "deploy" target on each of the services' install directories -->
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml
new file mode 100644
index 000000000..0a244c24b
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_co.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="collectionobjects">
+  <ns2:collectionobjects_naturalhistory
+    xmlns:ns2="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <taxonomicIdentGroupList>
+      <taxonomicIdentGroup>
+        <qualifier>questionable</qualifier>
+        <notes/>
+        <taxon>urn:cspace:lifesci.collectionspace.org:taxonomyauthority:name(taxon):item:name(AcerJaponicus1332900279183)'Acer
+          Japonicus'</taxon>
+        <reference/>
+        <identBy>urn:cspace:lifesci.collectionspace.org:personauthorities:name(person):item:name(PatrickSchmitz1332900293194)'Patrick
+          Schmitz'</identBy>
+        <institution/>
+      </taxonomicIdentGroup>
+    </taxonomicIdentGroupList>
+  </ns2:collectionobjects_naturalhistory>
+  <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		<objectNumber>2012.1.3</objectNumber>
+    <titleGroupList>
+      <titleGroup>
+        <title>This is a nice Object</title>
+        <titleType>generic</titleType>
+        <titleTranslationSubGroupList>
+          <titleTranslationSubGroup>
+            <titleTranslationLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(deu)'German'</titleTranslationLanguage>
+            <titleTranslation>Das ist ein nettes Object</titleTranslation>
+          </titleTranslationSubGroup>
+        </titleTranslationSubGroupList>
+        <titleLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(eng)'English'</titleLanguage>
+      </titleGroup>
+    </titleGroupList>
+    <responsibleDepartments>
+      <responsibleDepartment>antiquities</responsibleDepartment>
+    </responsibleDepartments>
+    <otherNumberList>
+      <otherNumber>
+        <numberValue>Obj123</numberValue>
+        <numberType>serial</numberType>
+      </otherNumber>
+    </otherNumberList>
+  </ns2:collectionobjects_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml
new file mode 100644
index 000000000..4e45d2bd3
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/lifesci_extended_injectedco.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="collectionobjects">
+  <ns2:collectionobjects_naturalhistory
+    xmlns:ns2="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <taxonomicIdentGroupList>
+      <taxonomicIdentGroup>
+        <qualifier>questionable</qualifier>
+        <notes/>
+        <taxon>urn:cspace:lifesci.collectionspace.org:taxonomyauthority:name(taxon):item:name(AcerJaponicus1332900279183)'Acer
+          Japonicus'</taxon>
+        <reference/>
+        <identBy>urn:cspace:lifesci.collectionspace.org:personauthorities:name(person):item:name(PatrickSchmitz1332900293194)'Patrick
+          Schmitz'</identBy>
+        <institution/>
+      </taxonomicIdentGroup>
+    </taxonomicIdentGroupList>
+    <nh_titleGroupList>
+			<nh_titleGroup>
+				<titleNote>This is an experiment</titleNote>
+			</nh_titleGroup>
+		</nh_titleGroupList>
+  </ns2:collectionobjects_naturalhistory>
+  <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		<objectNumber>2012.1.4</objectNumber>
+    <titleGroupList>
+      <titleGroup>
+        <title>This is a nice Object</title>
+        <titleType>generic</titleType>
+        <titleTranslationSubGroupList>
+          <titleTranslationSubGroup>
+            <titleTranslationLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(deu)'German'</titleTranslationLanguage>
+            <titleTranslation>Das ist ein nettes Object</titleTranslation>
+          </titleTranslationSubGroup>
+        </titleTranslationSubGroupList>
+        <titleLanguage>urn:cspace:lifesci.collectionspace.org:vocabularies:name(languages):item:name(eng)'English'</titleLanguage>
+      </titleGroup>
+    </titleGroupList>
+    <responsibleDepartments>
+      <responsibleDepartment>antiquities</responsibleDepartment>
+    </responsibleDepartments>
+    <otherNumberList>
+      <otherNumber>
+        <numberValue>Obj123</numberValue>
+        <numberType>serial</numberType>
+      </otherNumber>
+    </otherNumberList>
+  </ns2:collectionobjects_common>
+</document>
diff --git a/services/account/build.xml b/services/account/build.xml
index 35f631b27..58b72f192 100644
--- a/services/account/build.xml
+++ b/services/account/build.xml
@@ -112,9 +112,9 @@
         <ant antfile="pstore/build.xml" target="gen_ddl" inheritAll="false"/>
     </target>
     
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for account service">
-        <ant antfile="pstore/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="pstore/build.xml" target="create_cspace_db" inheritAll="false"/>
     </target>
 
     <target name="deploy" depends="install"
diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml
index d2faa9b65..2aa7e2ace 100644
--- a/services/account/pstore/build.xml
+++ b/services/account/pstore/build.xml
@@ -151,7 +151,7 @@
         </exec>
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for account service">
 				<sql driver="${db.jdbc.driver.class}"
              url="${db.jdbc.cspace.url}"
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 03f666293..2c16a79b6 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -112,9 +112,9 @@
         <ant antfile="pstore/build.xml" target="gen_ddl" inheritAll="false"/>
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for authentication service">
-        <ant antfile="pstore/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="pstore/build.xml" target="create_cspace_db" inheritAll="false"/>
     </target>
 
     <target name="deploy" depends="install"
diff --git a/services/authentication/pstore/build.xml b/services/authentication/pstore/build.xml
index 6d532cc3e..7599514c6 100644
--- a/services/authentication/pstore/build.xml
+++ b/services/authentication/pstore/build.xml
@@ -151,7 +151,7 @@
         </exec>
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for authentication service">
 				<sql driver="${db.jdbc.driver.class}"
              url="${db.jdbc.cspace.url}"
diff --git a/services/authorization-mgt/build.xml b/services/authorization-mgt/build.xml
index d3d59c4b5..b8fcde446 100644
--- a/services/authorization-mgt/build.xml
+++ b/services/authorization-mgt/build.xml
@@ -111,7 +111,7 @@
             description="generate service-specific tables(s), indices, etc.">
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for authorization service">
     </target>
 
diff --git a/services/authorization/build.xml b/services/authorization/build.xml
index add2af1df..6642711d7 100644
--- a/services/authorization/build.xml
+++ b/services/authorization/build.xml
@@ -112,9 +112,9 @@
         <ant antfile="pstore/build.xml" target="gen_ddl" inheritAll="false"/>
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for authorization service">
-        <ant antfile="pstore/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="pstore/build.xml" target="create_cspace_db" inheritAll="false"/>
     </target>
 
     <target name="deploy" depends="install"
diff --git a/services/authorization/pstore/build.xml b/services/authorization/pstore/build.xml
index 9200c4b6d..6e9a94820 100644
--- a/services/authorization/pstore/build.xml
+++ b/services/authorization/pstore/build.xml
@@ -151,7 +151,7 @@
         </exec>
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create tables(s), indices for authorization service">
 				<sql driver="${db.jdbc.driver.class}"
              url="${db.jdbc.cspace.url}"
diff --git a/services/build.xml b/services/build.xml
index 0abb9c54c..c08c244f4 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -131,12 +131,16 @@
         <ant antfile="account/build.xml" target="gen_ddl" inheritAll="false"/>
     </target>
 
-    <target name="create_db"
+    <target name="create_cspace_db"
             description="create service-specific tables(s), indices, etc.">
-        <ant antfile="authentication/build.xml" target="create_db" inheritAll="false"/>
-        <ant antfile="authorization/build.xml" target="create_db" inheritAll="false"/>
-        <ant antfile="account/build.xml" target="create_db" inheritAll="false"/>
-        <ant antfile="id/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="authentication/build.xml" target="create_cspace_db" inheritAll="false"/>
+        <ant antfile="authorization/build.xml" target="create_cspace_db" inheritAll="false"/>
+        <ant antfile="account/build.xml" target="create_cspace_db" inheritAll="false"/>
+    </target>
+
+    <target name="create_nuxeo_db"
+            description="create service-specific tables(s), indices, etc.">
+        <ant antfile="id/build.xml" target="create_nuxeo_db" inheritAll="false"/>
     </target>
 
     <target name="import"
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
index 895a69a7d..736a43853 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
@@ -18,14 +18,6 @@
   targetNamespace="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
   version="0.1">
 
-  <!-- used for testing
-  <xs:element name="nh-string" type="xs:string" />
-  <xs:element name="nh-int" type="xs:int"/>
-  <xs:element name="nh-long" type="xs:long"/>
-  <xs:element name="nh-date" type="xs:dateTime"/>
-  <xs:element name="nh-note" type="xs:string"/>
-  -->
-
   <!--  These items are being moved to common
   <xs:element name="fieldCollector" type="xs:string"/>
   <xs:element name="fieldCollectionDate" type="xs:string"/>
@@ -43,6 +35,23 @@
     <xs:element name="fieldLocLongDecimal" type="xs:string"/>
     <xs:element name="fieldLocElevation" type="xs:string"/>
 
+
+		<!-- Add in an extension field for the common title group -->
+		<xs:element name="nh_titleGroupList">
+			<xs:complexType>
+				<xs:sequence>
+					<xs:element name="nh_titleGroup">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="titleNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:complexType>
+    </xs:element>
+
+
   <!-- These will become contolled lists -->
     <xs:element name="fieldLocGeodeticDatum" type="xs:string"/>
     <xs:element name="fieldLocCoordinateSystem" type="xs:string"/>
diff --git a/services/id/build.xml b/services/id/build.xml
index cef43930f..ee3dac387 100644
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -106,9 +106,9 @@
         </exec>
     </target>
 
-    <target name="create_db"
+    <target name="create_nuxeo_db"
     description="create tables(s), indices for id service">
-        <ant antfile="service/build.xml" target="create_db" inheritAll="false"/>
+        <ant antfile="service/build.xml" target="create_nuxeo_db" inheritAll="false"/>
     </target>
 
     <target name="deploy" depends="install"
diff --git a/services/id/service/build.xml b/services/id/service/build.xml
index 5e069ac74..496d60bf8 100644
--- a/services/id/service/build.xml
+++ b/services/id/service/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="create_db"
+    <target name="create_nuxeo_db"
     description="create tables(s), indices for id service">
 				<sql driver="${db.jdbc.driver.class}"
             url="${db.jdbc.nuxeo.url}"
diff --git a/src/main/resources/db/mysql/init_cspace_db.sql b/src/main/resources/db/mysql/init_cspace_db.sql
new file mode 100644
index 000000000..7d4cb29d6
--- /dev/null
+++ b/src/main/resources/db/mysql/init_cspace_db.sql
@@ -0,0 +1,24 @@
+--
+-- delete all users
+--
+-- DELETE FROM mysql.user WHERE NOT (host="localhost" and user="root");
+-- FLUSH PRIVILEGES;
+
+--
+-- delete anonymous access
+--
+DELETE FROM mysql.user WHERE User = '';
+FLUSH PRIVILEGES;
+
+--
+-- recreate cspace database
+--
+DROP database IF EXISTS cspace;
+CREATE database cspace DEFAULT CHARACTER SET utf8;
+
+--
+-- grant privileges to users on cspace database
+--
+GRANT ALL PRIVILEGES ON cspace.* TO '@DB_CSPACE_USER@'@'localhost' IDENTIFIED BY '@DB_CSPACE_PASSWORD@' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+
diff --git a/src/main/resources/db/mysql/init_db.sql b/src/main/resources/db/mysql/init_nuxeo_db.sql
similarity index 57%
rename from src/main/resources/db/mysql/init_db.sql
rename to src/main/resources/db/mysql/init_nuxeo_db.sql
index e5e21b2b8..d482a9bff 100644
--- a/src/main/resources/db/mysql/init_db.sql
+++ b/src/main/resources/db/mysql/init_nuxeo_db.sql
@@ -1,44 +1,24 @@
---
--- delete all users
---
--- DELETE FROM mysql.user WHERE NOT (host="localhost" and user="root");
--- FLUSH PRIVILEGES;
-
---
--- delete anonymous access
---
-DELETE FROM mysql.user WHERE User = '';
-FLUSH PRIVILEGES;
-
---
--- recreate cspace database
---
-DROP database IF EXISTS cspace;
-CREATE database cspace DEFAULT CHARACTER SET utf8;
-
---
--- recreate nuxeo database
---
-DROP database IF EXISTS nuxeo;
-CREATE database nuxeo DEFAULT CHARACTER SET utf8;
-
-
---
--- grant privileges to users on nuxeo and cspace databases
---
-GRANT ALL PRIVILEGES ON cspace.* TO '@DB_CSPACE_USER@'@'localhost' IDENTIFIED BY '@DB_CSPACE_PASSWORD@' WITH GRANT OPTION;
-FLUSH PRIVILEGES;
-GRANT ALL PRIVILEGES ON nuxeo.* TO '@DB_NUXEO_USER@'@'localhost' IDENTIFIED BY '@DB_NUXEO_PASSWORD@' WITH GRANT OPTION;
---
--- Grant privileges to read-only user on Nuxeo, for reporting. 
---
-GRANT SELECT ON nuxeo.* TO 'reader'@'localhost' IDENTIFIED BY 'read';
---
--- Grant privileges to remote read-only users on Nuxeo, for reporting. 
--- These should be changed to reflect your domain. Avoid specifying
--- 'reader'@'%' (while simple and flexible, this is a potential security hole).
---
-GRANT SELECT ON nuxeo.* TO 'reader'@'%.berkeley.edu' IDENTIFIED BY 'read';
-GRANT SELECT ON nuxeo.* TO 'reader'@'%.movingimage.us' IDENTIFIED BY 'read';
-FLUSH PRIVILEGES;
-
+--
+-- recreate nuxeo database
+--
+DROP database IF EXISTS nuxeo;
+CREATE database nuxeo DEFAULT CHARACTER SET utf8;
+
+
+--
+-- grant privileges to users on nuxeo database
+--
+GRANT ALL PRIVILEGES ON nuxeo.* TO '@DB_NUXEO_USER@'@'localhost' IDENTIFIED BY '@DB_NUXEO_PASSWORD@' WITH GRANT OPTION;
+--
+-- Grant privileges to read-only user on Nuxeo, for reporting. 
+--
+GRANT SELECT ON nuxeo.* TO 'reader'@'localhost' IDENTIFIED BY 'read';
+--
+-- Grant privileges to remote read-only users on Nuxeo, for reporting. 
+-- These should be changed to reflect your domain. Avoid specifying
+-- 'reader'@'%' (while simple and flexible, this is a potential security hole).
+--
+GRANT SELECT ON nuxeo.* TO 'reader'@'%.berkeley.edu' IDENTIFIED BY 'read';
+GRANT SELECT ON nuxeo.* TO 'reader'@'%.movingimage.us' IDENTIFIED BY 'read';
+FLUSH PRIVILEGES;
+
diff --git a/src/main/resources/db/postgresql/init_cspace_db.sql b/src/main/resources/db/postgresql/init_cspace_db.sql
new file mode 100644
index 000000000..2bd020948
--- /dev/null
+++ b/src/main/resources/db/postgresql/init_cspace_db.sql
@@ -0,0 +1,11 @@
+-- drop all the objects before dropping roles
+DROP database IF EXISTS cspace;
+
+DROP USER IF EXISTS cspace;
+
+CREATE ROLE @DB_CSPACE_USER@ WITH PASSWORD '@DB_CSPACE_PASSWORD@' LOGIN;
+
+--
+-- recreate cspace database
+--
+CREATE DATABASE cspace ENCODING 'UTF8' OWNER @DB_CSPACE_USER@;
diff --git a/src/main/resources/db/postgresql/init_db.sql b/src/main/resources/db/postgresql/init_nuxeo_db.sql
similarity index 69%
rename from src/main/resources/db/postgresql/init_db.sql
rename to src/main/resources/db/postgresql/init_nuxeo_db.sql
index 29d3658bd..92648440b 100644
--- a/src/main/resources/db/postgresql/init_db.sql
+++ b/src/main/resources/db/postgresql/init_nuxeo_db.sql
@@ -1,27 +1,23 @@
--- drop all the objects before dropping roles
-DROP database IF EXISTS cspace;
-DROP database IF EXISTS nuxeo;
-
-DROP USER IF EXISTS nuxeo;
-DROP USER IF EXISTS cspace;
-DROP USER IF EXISTS reader;
-
-CREATE ROLE @DB_NUXEO_USER@ WITH PASSWORD '@DB_NUXEO_PASSWORD@' LOGIN;
-CREATE ROLE @DB_CSPACE_USER@ WITH PASSWORD '@DB_CSPACE_PASSWORD@' LOGIN;
-CREATE ROLE reader WITH PASSWORD 'read' LOGIN;
-
---
--- recreate jbossdb, cspace, and nuxeo databases
---
-CREATE DATABASE cspace ENCODING 'UTF8' OWNER @DB_CSPACE_USER@;
-CREATE DATABASE nuxeo ENCODING 'UTF8' OWNER @DB_NUXEO_USER@;
-
---
--- Grant privileges to read-only user on Nuxeo, for reporting. 
---
-GRANT CONNECT ON DATABASE nuxeo TO reader;
-
--- GRANT SELECT ON ALL TABLES IN SCHEMA public TO reader;
--- This must be run by hand, after the system has already started up,
--- so that it gives access to all the tables created on init.
-
+-- drop all the objects before dropping roles
+DROP database IF EXISTS nuxeo;
+
+DROP USER IF EXISTS nuxeo;
+DROP USER IF EXISTS reader;
+
+CREATE ROLE @DB_NUXEO_USER@ WITH PASSWORD '@DB_NUXEO_PASSWORD@' LOGIN;
+CREATE ROLE reader WITH PASSWORD 'read' LOGIN;
+
+--
+-- recreate nuxeo database
+--
+CREATE DATABASE nuxeo ENCODING 'UTF8' OWNER @DB_NUXEO_USER@;
+
+--
+-- Grant privileges to read-only user on Nuxeo, for reporting. 
+--
+GRANT CONNECT ON DATABASE nuxeo TO reader;
+
+-- GRANT SELECT ON ALL TABLES IN SCHEMA public TO reader;
+-- This must be run by hand, after the system has already started up,
+-- so that it gives access to all the tables created on init.
+
-- 
2.47.3