CSPACE-575: Adding updated "installer" related ant targets, scripts, props etc.

diff --git a/build.xml b/build.xml
index 75e1ea8909e2ea8fc3f1f40c9dc0e738497b0d79..4cbc54949ed872c2574b20d4dec342f9ee9c6db0 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -267,6 +267,7 @@
        description="Installer: Creates an installer distribution for the CollectionSpace services.">\r
         <!-- copy install scripts, etc. -->\r
         <copy todir="${basedir}/${dist.installer}">\r
+            <fileset file="${basedir}/build.properties"/>\r
             <fileset dir="installer"/>\r
             <fileset dir="${src}/main/resources/scripts"/>            \r
         </copy>\r

diff --git a/installer/build.properties b/installer/build.properties
deleted file mode 100644 (file)
index 770a857..0000000
--- a/installer/build.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-#cspace\r
-cspace.release=0.2\r
-cspace.services.release=cspace-services-${cspace.release}\r
-cspace.services.war=cspace-services.war\r
-domain.cspace=cspace\r
-domain.nuxeo=default\r
-\r
-#nuxeo\r
-#nuxeo.release=5.2.M4\r
-nuxeo.release=5.2.GA\r
-nuxeo.ear=nuxeo.ear\r
-nuxeo.system=${nuxeo.ear}/system\r
-\r
-#distribution\r
-dist=dist\r
-dist.cspace=${dist}/cspace\r
-dist.nuxeo=${dist}/nuxeo\r
-\r
-#dist cspace domain\r
-dist.domain.cspace=${domain.cspace}\r
-dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}\r
-dist.deploy.cspace=${dist.server.cspace}/deploy\r
-dist.lib.cspace=${dist.server.cspace}/lib\r
-\r
-#dist nuxeo domain\r
-dist.domain.nuxeo=${domain.nuxeo}\r
-dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}\r
-dist.deploy.nuxeo=${dist.server.nuxeo}/deploy\r
-dist.lib.nuxeo=${dist.server.nuxeo}/lib\r
-dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}\r
-\r
-#jboss\r
-#assumption: both nuxeo and cspace domains are using the same JBoss installation\r
-jboss.release=jboss-4.2.3.GA\r
-jboss.dir=C:/dev/${jboss.release}\r
-jboss.home=${jboss.dir}\r
-\r
-#jboss cspace domain\r
-jboss.domain.cspace=${domain.cspace}\r
-jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}\r
-jboss.deploy.cspace=${jboss.server.cspace}/deploy\r
-jboss.lib.cspace=${jboss.server.cspace}/lib\r
-jboss.deploy.cspace.services=${jboss.server.cspace}/deploy/${cspace.services.war}\r
-\r
-#jboss nuxeo domain\r
-jboss.domain.nuxeo=${domain.nuxeo}\r
-jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}\r
-jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy\r
-jboss.lib.nuxeo=${jboss.server.nuxeo}/lib\r
-jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}\r
-\r

diff --git a/installer/build.xml b/installer/build.xml
index 37b3819986c4893258ad341fb67a2a38d2d84dae..3b4014dd3d954ab5431cc8d92f0c82226c45fa67 100644 (file)
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -20,9 +20,6 @@
     \r
     <target name="install"\r
        description="Installer: Copy artifacts for CollectionSpace Nuxeo doctypes">\r
-        <copy todir="${jboss.deploy.nuxeo.system}">\r
-            <fileset file="${services.trunk}/${dist.deploy.nuxeo.system}/*.jar"/>\r
-        </copy>\r
         <!-- cspace\server\cspace -->     \r
         <copy todir="${jboss.server.cspace}/cspace">\r
             <fileset dir="${services.trunk}/${dist.server.cspace}/cspace"/>\r
@@ -48,22 +45,19 @@
             <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib/${nuxeo.release}">\r
                <include name="*.jar"/>\r
                                                </fileset>\r
-        </copy>        \r
+        </copy>\r
+        <!-- Now execute the "install" target on the services -->\r
+                               <ant antfile="services/build.xml" target="install" inheritAll="false"/>        \r
     </target>    \r
     \r
-    <target name="config" description="">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />\r
-                               </exec>\r
+    <target name="config" description="" depends="install">\r
+        <!-- Now execute the "install" target on the services -->\r
+                               <ant antfile="services/build.xml" target="config" inheritAll="false"/>        \r
     </target>    \r
     \r
-    <target name="predeploy">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing installer's &apos;predeploy&apos; target." />\r
-                               </exec>\r
-                               \r
+    <target name="predeploy" depends="config">\r
         <exec executable="echo">\r
-                       <arg value="Creating necessary databases and associated users and privileges." />\r
+                       <arg value="Installer: Creating necessary databases and associated users and privileges." />\r
                                </exec>\r
         <sql driver="com.mysql.jdbc.Driver"\r
         url="jdbc:mysql://localhost:3306/cspace"\r
@@ -80,17 +74,16 @@
     </target>\r
     \r
     <target name="deploy" description="">\r
-        <exec executable="echo">\r
-                       <arg value="Installer: Executing CollectionSpace Service's &apos;deploy&apos; target." />\r
-                               </exec>\r
+                               <!-- Now, invoke the "deploy" target on each of the services' install directories -->\r
+        <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>         \r
     </target>     \r
        \r
     <target name="postdeploy">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing installer's &apos;postdeploy&apos; target." />\r
                                </exec>\r
-                               <!-- Now, invoke the "predeploy" target on each of the services' install directories -->\r
-        <ant antfile="services/build.xml" target="postdeploy" inheritAll="false"/>             \r
+                               <!-- Now, invoke the "postdeploy" target on each of the services' install directories -->\r
+        <ant antfile="services/build.xml" target="postdeploy" inheritAll="false"/>\r
     </target>\r
 \r
 </project>\r

diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
index 81c11857076a865247c8e31ad360cd0d1a2fdca8..d13a0333cd1f79d541381151f482e34747994173 100644 (file)
--- a/services/collectionobject/installer/build.xml
+++ b/services/collectionobject/installer/build.xml
@@ -26,13 +26,13 @@
         </copy>\r
     </target>\r
 \r
-    <target name="config" description="">\r
+    <target name="config" description="" depends="install">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing CollectionObject Service's &apos;config&apos; target." />\r
                                </exec>\r
     </target>\r
 \r
-    <target name="predeploy" description="">\r
+    <target name="predeploy" description="" depends="config">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing CollectionObject Service's &apos;predeploy&apos; target." />\r
                                </exec>\r

diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
index dc2ed159f3a1f53381b5c4142f4e52d8aad5ed7a..eb9d0e0ad19ae07ce3f2fe1f0a60bfa6e3b6fd67 100644 (file)
--- a/services/id/installer/build.xml
+++ b/services/id/installer/build.xml
@@ -23,13 +23,13 @@
                                </exec>\r
     </target>\r
 \r
-    <target name="config" description="">\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">\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

diff --git a/services/installer/build.xml b/services/installer/build.xml
index a7d601cb8bc2c6598cc1085cc98e6cb12381407e..fef1f4d4ab2050fedf0e57d78842509c0ac68703 100644 (file)
--- a/services/installer/build.xml
+++ b/services/installer/build.xml
@@ -18,19 +18,22 @@
     \r
     <target name="install"\r
        description="Copy artifacts for CollectionSpace Nuxeo doctypes">\r
-        <copy todir="${jboss.deploy.nuxeo.system}">\r
-            <fileset file="${services.trunk}/${dist.deploy.nuxeo.system}/*.jar"/>\r
-        </copy>        \r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionSpace Service's &apos;install&apos; target." />\r
+                               </exec>\r
+        <ant antfile="id/build.xml" target="install" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="install" inheritAll="false"/>\r
+        <ant antfile="vocabulary/build.xml" target="install" inheritAll="false"/>\r
     </target>\r
     \r
-    <target name="config" description="">\r
+    <target name="config" description="" depends="install">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />\r
                                </exec>\r
     </target>    \r
 \r
     <!-- this target is called in order based on the dependencies between the services -->\r
-    <target name="predeploy" description="">\r
+    <target name="predeploy" description="" depends="config">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing services &apos;predeploy&apos; target." />\r
                                </exec>         \r

diff --git a/services/vocabulary/import/build.xml b/services/vocabulary/import/build.xml
index 75761ad0d923b8289b4224511805cace725b8501..b183150a68319375767b7756f62ac0e89e4242b7 100644 (file)
--- a/services/vocabulary/import/build.xml
+++ b/services/vocabulary/import/build.xml
@@ -50,7 +50,7 @@
     <target name="dist_installer" depends="package"\r
        description="distribute vocabulary service importer tool">        \r
         <!-- copy install scripts, etc. -->\r
-        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/init">\r
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/postdeploy">\r
             <fileset dir="${basedir}/target">\r
                <include name="*with-dependencies*.jar"/>\r
             </fileset>\r

diff --git a/services/vocabulary/installer/build.xml b/services/vocabulary/installer/build.xml
index 3f1251fe0319cf4d5c74a03d18de1b0894d6a75c..1e04433966434aa27e5b8d549892385aeddce6ac 100644 (file)
--- a/services/vocabulary/installer/build.xml
+++ b/services/vocabulary/installer/build.xml
@@ -26,13 +26,13 @@
         </copy>                                \r
     </target>    \r
 \r
-    <target name="config" description="">\r
+    <target name="config" description="" depends="install">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing Vocabulary Service's &apos;config&apos; target." />\r
                                </exec>\r
     </target>\r
     \r
-    <target name="predeploy" description="">\r
+    <target name="predeploy" description="" depends="config">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing Vocabulary Service's &apos;predeploy&apos; target." />\r
                                </exec>\r
@@ -51,10 +51,9 @@
         <exec executable="echo">\r
                        <arg value="Importing necessary vocabularies." />\r
                                </exec>                         \r
-        <java jar="./init/collectionspace-services-vocabulary-importer-jar-with-dependencies.jar"\r
+        <java jar="./postdeploy/collectionspace-services-vocabulary-importer-jar-with-dependencies.jar"\r
                fork="true"\r
                failonerror="true">\r
-               <arg value="-h"/>\r
                                </java> \r
     </target>\r
     \r