CSPACE-3546, CSPACE-2903, CSPACE-2421, CSPACE-2170, CSPACE-2000, CSPACE-1894. Complet...

diff --git a/build.properties b/build.properties
index ddceb388b9450f9885f5a18ecae7b2f0ec695980..7dd8d18a30d644b40d3a7aafe1c6749017e34155 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -87,7 +87,7 @@ db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
 \r
 \r
 #database common settings\r
-db.script.dir=${basedir}/src/main/resources/db/${db}\r
+db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}\r
 db.user=${env.DB_USER}\r
 db.user.password=${env.DB_PASSWORD}\r
 db.nuxeo.user=nuxeo\r

diff --git a/build.xml b/build.xml
index 8d149d9778ff777d5b2cd6c4607bc4d24fe1cc9d..eb311ae2405be6549ae0a7d5bf568aa8a48bfc03 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -207,7 +207,12 @@
         <ant antfile="services/build.xml" target="gen_ddl" inheritAll="false"/>\r
     </target>\r
 \r
-    <target name="create_db" \r
+    <target name="create_db" depends="create_base_db"\r
+            description="create database(s), invoke subtasks for indexes, etc.">\r
+        <ant antfile="services/build.xml" target="create_db" inheritAll="false"/>\r
+    </target>\r
+\r
+    <target name="create_base_db" \r
             description="create database(s), grant privileges to test users">\r
                        <sql driver="${db.jdbc.driver.class}"\r
              url="${db.jdbc.baseurl}"\r
@@ -219,7 +224,6 @@
                 <pathelement path="${db.driver.jar}"/>\r
             </classpath>\r
         </sql>\r
-        <ant antfile="services/build.xml" target="create_db" inheritAll="false"/>\r
     </target>\r
 \r
     <target name="import"\r
@@ -227,7 +231,7 @@
         <ant antfile="services/build.xml" target="import" inheritAll="false"/>\r
     </target>\r
 \r
-    <target name="deploy" depends="install,setup_jbossds.cfg,setup_cspaceds.cfg"\r
+    <target name="deploy" depends="install,setup_jbossds.cfg,setup_cspaceds.cfg,setup_initdb.sql"\r
             description="deploy services in ${jboss.server.cspace}">\r
         <!-- copy db scripts, etc. -->\r
                                <copy todir="${jboss.server.cspace}/cspace/services/scripts">\r
@@ -282,6 +286,22 @@
                        </copy>\r
     </target>\r
 \r
+               <target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">\r
+                       <copy todir="${jboss.server.cspace}/cspace/services/db">\r
+        <fileset dir="${src}/main/resources/db"/>\r
+                               <filterset>\r
+                                        <!-- Note: double-subs from ${db.xyz.password} fail -->\r
+                                       <filter token="DB_CSPACE_USER" value="${db.cspace.user}" />\r
+                                       <filter token="DB_NUXEO_USER" value="${db.nuxeo.user}" />\r
+                                       <filter token="DB_JBOSS_USER" value="${db.jboss.user}" />\r
+                                 <filter token="DB_CSPACE_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" />\r
+                                       <filter token="DB_NUXEO_PASSWORD" value="${env.DB_PASSWORD_NUXEO}" />\r
+                                       <filter token="DB_JBOSS_PASSWORD" value="${env.DB_PASSWORD_JBOSS}" />\r
+                               </filterset>\r
+                       </copy>\r
+    </target>\r
+               \r
+ \r
 \r
     <target name="undeploy"\r
             description="undeploy services from ${jboss.server.cspace}">\r

diff --git a/installer/build.xml b/installer/build.xml
index 73021a7174c41856291c78f4d32b0bf5fc988867..d02d547051bd44e720a00a79bfa58162e5e54269 100644 (file)
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -8,9 +8,6 @@
     <property file="build.properties" />\r
     <property name="src" location="src"/>\r
 \r
-               <!-- <property name="db" value="mysql"/> -->\r
-    <property name="db.script.dir" location="${basedir}/db/${db}"/>\r
-\r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
     </condition>\r

diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
deleted file mode 100644 (file)
index eb9d0e0..0000000
--- a/services/id/installer/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-\r
-<project name="id-service-install" default="package" basedir=".">\r
-    <description>\r
-        CollectionSpace ID Service Installer Targets\r
-    </description>\r
-  <!-- set global properties for this build -->\r
-    <property file="${basedir}/../../build.properties" />    \r
-    <property name="src" location="src"/>\r
-\r
-    <property name="db" value="mysql"/>\r
-    <property name="db.script.dir" location="${basedir}/db/${db}"/>\r
-\r
-    <condition property="osfamily-unix">\r
-        <os family="unix" />\r
-    </condition>\r
-    <condition property="osfamily-windows">\r
-        <os family="windows" />\r
-    </condition>\r
-\r
-    <target name="install" description="">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing ID Service's &apos;install&apos; target." />\r
-                               </exec>\r
-    </target>\r
-\r
-    <target name="config" description="" depends="install">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing ID Service's &apos;config&apos; target." />\r
-                               </exec>\r
-    </target>\r
-\r
-    <target name="predeploy" depends="config">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing ID Service's &apos;predeploy&apos; target for the ID Service." />\r
-                               </exec>\r
-                               \r
-        <exec executable="echo">\r
-                       <arg value="Installer: Creating necessary database tables for the ID Service." />\r
-                               </exec>                         \r
-                               <!-- Create the tables -->\r
-        <sql driver="com.mysql.jdbc.Driver"\r
-                                       url="jdbc:mysql://localhost:3306/cspace"\r
-                                       userid="root"\r
-                                       password="admin"\r
-                                       src="${db.script.dir}/create_id_generators_table.sql">\r
-                                           <classpath>\r
-                                               <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>\r
-                                           </classpath>\r
-        </sql>\r
-               \r
-        <exec executable="echo">\r
-                       <arg value="Installer: Loading tables for the ID Service." />\r
-                               </exec>         \r
-                               \r
-                               <!-- Load the tables -->\r
-        <sql driver="com.mysql.jdbc.Driver"\r
-               url="jdbc:mysql://localhost:3306/cspace"\r
-               userid="root"\r
-               password="admin"\r
-               src="${db.script.dir}/load_id_generators.sql">\r
-                   <classpath>\r
-                       <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>\r
-                   </classpath>\r
-        </sql>         \r
-    </target>\r
-    \r
-    <target name="deploy" description="">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing ID Service's &apos;deploy&apos; target." />\r
-                               </exec>\r
-    </target>\r
-    \r
-    <target name="postdeploy" description="">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing ID Service's &apos;init&apos; target." />\r
-                               </exec>\r
-    </target>\r
-    \r
-</project>\r

diff --git a/services/security/client/build.xml b/services/security/client/build.xml
index 4c3cb31a4ff145e917138557e8ce2c6cc2ff6f91..9716c9a6eac78c1fa1b8d32592c5c838229b2a98 100644 (file)
--- a/services/security/client/build.xml
+++ b/services/security/client/build.xml
@@ -125,19 +125,6 @@
         </copy>\r
     </target>\r
 \r
-    <target name="create_db"\r
-    description="create tables(s), indices for security service">\r
-        <sql driver="${db.jdbc.driver.class}"\r
-        url="${db.jdbc.cspace.url}"\r
-        userid="${db.cspace.user}"\r
-        password="${db.cspace.user.password}"\r
-        src="${db.script.dir}/test_authn.sql" >\r
-            <classpath>\r
-                <pathelement path="${db.driver.jar}"/>\r
-            </classpath>\r
-        </sql>\r
-    </target>\r
-    \r
     <target name="deploy" depends="install"\r
     description="deploy security service in ${jboss.server.cspace}">\r
         \r

diff --git a/src/main/resources/db/mysql/init_db.sql b/src/main/resources/db/mysql/init_db.sql
index 18cf584bbe11ae8ccfdd6d260503f866cdd4709e..63ccc287d0ea547a16251ceaf35941f43b2cb0a5 100644 (file)
--- a/src/main/resources/db/mysql/init_db.sql
+++ b/src/main/resources/db/mysql/init_db.sql
@@ -32,11 +32,11 @@ CREATE database nuxeo DEFAULT CHARACTER SET utf8;
 --\r
 -- grant privileges to test user on nuxeo and jbossdb databases\r
 --\r
-GRANT ALL PRIVILEGES ON jbossdb.* TO 'jboss'@'localhost' IDENTIFIED BY 'jbpw' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON jbossdb.* TO '@DB_JBOSS_USER@'@'localhost' IDENTIFIED BY '@DB_JBOSS_PASSWORD@' WITH GRANT OPTION;\r
 FLUSH PRIVILEGES;\r
-GRANT ALL PRIVILEGES ON cspace.* TO 'cspace'@'localhost' IDENTIFIED BY 'cspw' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON cspace.* TO '@DB_CSPACE_USER@'@'localhost' IDENTIFIED BY '@DB_CSPACE_PASSWORD@' WITH GRANT OPTION;\r
 FLUSH PRIVILEGES;\r
-GRANT ALL PRIVILEGES ON nuxeo.* TO 'nuxeo'@'localhost' IDENTIFIED BY 'nuxpw' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON nuxeo.* TO '@DB_NUXEO_USER@'@'localhost' IDENTIFIED BY '@DB_NUXEO_PASSWORD@' WITH GRANT OPTION;\r
 --\r
 -- Grant privileges to read-only user on Nuxeo, for reporting. \r
 --\r

diff --git a/src/main/resources/db/postgresql/init_db.sql b/src/main/resources/db/postgresql/init_db.sql
index 0d44a49f9b2f3380e70761a9cb494accd60162ca..25aece532d1aee40b5669f8f83d9595dd7731b91 100644 (file)
--- a/src/main/resources/db/postgresql/init_db.sql
+++ b/src/main/resources/db/postgresql/init_db.sql
@@ -7,17 +7,17 @@ DROP USER IF EXISTS nuxeo;
 DROP USER IF EXISTS cspace;\r
 DROP USER IF EXISTS jboss;\r
 \r
-CREATE ROLE nuxeo WITH PASSWORD 'nuxpw' LOGIN;\r
-CREATE ROLE cspace WITH PASSWORD 'cspw' LOGIN;\r
-CREATE ROLE jboss WITH PASSWORD 'jbpw' LOGIN;\r
+CREATE ROLE @DB_NUXEO_USER@ WITH PASSWORD '@DB_NUXEO_PASSWORD@' LOGIN;\r
+CREATE ROLE @DB_CSPACE_USER@ WITH PASSWORD '@DB_CSPACE_PASSWORD@' LOGIN;\r
+CREATE ROLE @DB_JBOSS_USER@ WITH PASSWORD '@DB_JBOSS_PASSWORD@' LOGIN;\r
 CREATE ROLE reader WITH PASSWORD 'read' LOGIN;\r
 \r
 --\r
 -- recreate jbossdb, cspace, and nuxeo databases\r
 --\r
-CREATE database jbossdb OWNER jboss;\r
-CREATE DATABASE cspace ENCODING 'UTF8' OWNER cspace;\r
-CREATE DATABASE nuxeo ENCODING 'UTF8' OWNER nuxeo;\r
+CREATE database jbossdb OWNER @DB_JBOSS_USER@;\r
+CREATE DATABASE cspace ENCODING 'UTF8' OWNER @DB_CSPACE_USER@;\r
+CREATE DATABASE nuxeo ENCODING 'UTF8' OWNER @DB_NUXEO_USER@;\r
 \r
 --\r
 -- Grant privileges to read-only user on Nuxeo, for reporting. \r