From 494a7b7b405282df1acf3bda67abbfc055ff0923 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 28 Aug 2009 16:39:18 +0000
Subject: [PATCH] Integrated r1937,r1938: Added load-data (load --data) and
 load-init (load --init) ant targets to ecdc , ant deploy-ccm-core now
 generates a ccm-version.properties file containing the current version and
 release numbers

git-svn-id: https://svn.libreccm.org/ccm/trunk@249 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/build-hooks.xml                   |  4 +++
 tools-ng/ecdc/scriptlib/build-ccm.xml      | 16 ++++++++++
 tools-ng/ecdc/scriptlib/build-ccm.xml.orig | 35 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/ccm-core/build-hooks.xml b/ccm-core/build-hooks.xml
index 30ce532dc..7058d3053 100755
--- a/ccm-core/build-hooks.xml
+++ b/ccm-core/build-hooks.xml
@@ -53,6 +53,10 @@
     <mkdir dir="${this.deploy.dir}/WEB-INF/conf"/>
     <copy todir="${this.deploy.dir}/WEB-INF/conf"
           file="${src.dir}/log4j.properties"/>
+    <xslt style="${ccm.tools.xsl.dir}/build-version.xsl" 
+          in="${ccm.project.dir}/project.xml"
+          out="${build.classes.dir}/ccm-version.properties" 
+          classpathref="ccm.tools.classpath" force="yes" />
   </target>
 
 </project>
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml
index 06a26aa73..ebfc344ca 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml
@@ -48,6 +48,22 @@
                            value="${java.protocol.handler.pkgs}" />
               -->
  	          <arg line="load  ${applications} " />
+        </java>
+    </target>
+
+    <target name="load-data" depends="prepare-load">
+        <echo>load --data ${applications}</echo>
+        <java classname="com.arsdigita.packaging.MasterTool" classpathref="ccm.classpath" fork="yes">
+            <sysproperty key="ccm.home" value="${ccm.home}" />
+            <arg line="load --data ${applications}" />
+        </java>
+    </target>
+
+    <target name="load-init" depends="prepare-load">
+        <echo>load --init ${applications}</echo>
+        <java classname="com.arsdigita.packaging.MasterTool" classpathref="ccm.classpath" fork="yes">
+            <sysproperty key="ccm.home" value="${ccm.home}" />
+            <arg line="load --data ${applications}" />
  	    </java>
  	</target>
  	
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml.orig b/tools-ng/ecdc/scriptlib/build-ccm.xml.orig
index 4ec76d5c9..06a26aa73 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml.orig
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml.orig
@@ -126,4 +126,39 @@
         </java>
     </target>	
 
+    <target name="new-app">
+        <fail message="Please specify -Dnew.app.name=&lt;name&gt; at the command line">
+            <condition>
+                <not>
+                    <isset property="new.app.name" />
+                </not>
+            </condition>
+        </fail>
+        <echo>Creating new application ${new.app.name}</echo>
+        <mkdir dir="${new.app.name}" />
+        <copy todir="${new.app.name}" preservelastmodified="true" verbose="true">
+            <fileset dir="${ccm.project.dir}/tools-ng/ecdc/templates/new-app">
+                <exclude name="src/new.app.name.*" />
+            </fileset>
+            <filterset>
+                <filter token="new.app.name" value="${new.app.name}" />
+            </filterset>
+        </copy>
+        <copy tofile="${new.app.name}/src/${new.app.name}.config" file="${ccm.project.dir}/tools-ng/ecdc/templates/new-app/src/new.app.name.config" preservelastmodified="true" verbose="true">
+            <filterset>
+                <filter token="new.app.name" value="${new.app.name}" />
+            </filterset>
+        </copy>
+        <copy tofile="${new.app.name}/src/${new.app.name}.load" file="${ccm.project.dir}/tools-ng/ecdc/templates/new-app/src/new.app.name.load" preservelastmodified="true" verbose="true">
+            <filterset>
+                <filter token="new.app.name" value="${new.app.name}" />
+            </filterset>
+        </copy>
+        <copy tofile="${new.app.name}/src/${new.app.name}.upgrade" file="${ccm.project.dir}/tools-ng/ecdc/templates/new-app/src/new.app.name.upgrade" preservelastmodified="true" verbose="true">
+            <filterset>
+                <filter token="new.app.name" value="${new.app.name}" />
+            </filterset>
+        </copy>
+    </target>
+
 </project>