From 6b0f51531fe33b3ff0dd765c9b7ad5e930197e7e Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 28 Aug 2009 18:04:27 +0000
Subject: [PATCH] Integrated r1944,r1946,r1952,r1955: Added 'ccm' command to
 ecdc (couldn't find a user-friendly way to use ant directly), removed
 'temporary measure' from ecdc instructions and added example of how to
 configure the 'devel' bundle for using Oracle, removed dependency of 'ccm'
 target on 'prepare-load' in build-ccm.xml.

git-svn-id: https://svn.libreccm.org/ccm/trunk@251 8810af33-2d31-482b-a856-94f89814c4df
---
 tools-ng/ecdc/README.txt                   | 31 +++++++++++++++++-----
 tools-ng/ecdc/bin/ccm.cmd                  |  1 +
 tools-ng/ecdc/project.xml.complete         |  3 ---
 tools-ng/ecdc/scriptlib/build-ccm.xml      | 12 +++++++++
 tools-ng/ecdc/scriptlib/build-ccm.xml.orig | 23 ++++++++++++++++
 5 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 tools-ng/ecdc/bin/ccm.cmd

diff --git a/tools-ng/ecdc/README.txt b/tools-ng/ecdc/README.txt
index 3a772f3df..7bf062df1 100644
--- a/tools-ng/ecdc/README.txt
+++ b/tools-ng/ecdc/README.txt
@@ -49,6 +49,25 @@ Oracle 10g RDBMS or PostgresQL up to version 8.2
      by your working bundle. Keep the list of modules in sync with
      project.xml!
 
+     ---------------------------------------------------------------------------
+     EXAMPLE: Set up the "devel" environment with Oracle:
+
+     (i)  Add the following configuration property to local.ccm.properties
+          in order to use the "devel" bundle:
+
+          ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
+
+     (ii) Append the following properties to
+          ccm-ldn-aplaws/bundles/devel/cfg/integration.properties in order
+          to provide a minimum configuration for running the server:
+
+          waf.admin.name.screen=admin
+          waf.web.server=localhost\:8080
+          waf.runtime.jdbc_url=jdbc\:oracle\:thin\:ccm/ccm@localhost\:1521\:ORCL
+          waf.kernel.primary_user_identifier=screen_name
+          com.arsdigita.forum.digest_user_email=admin@example.com
+     ---------------------------------------------------------------------------
+
 (e)  ant install-tomcat 
      will create a runtime directory and install Tomcat 6 for testing. 
 
@@ -56,7 +75,7 @@ Oracle 10g RDBMS or PostgresQL up to version 8.2
      will create the compile and deploy tasks
 
 (g)  ant deploy 
-     will compile and deploy into your test environment (runtime)
+     will compile and deploy into your test environment (runtime)
 
 (h)  ant load-bundle 
      will load the database. May take several minutes!
@@ -66,11 +85,11 @@ Oracle 10g RDBMS or PostgresQL up to version 8.2
 
 (j)  Open your browser:
          http://localhost:8080/
-         http://localhost:8080/ccm/content-center/
-
-     Be aware: the previous ccm-scripts based environment used
-     port 9000 by default. May be still specified in your
-     bundle file (integration.properties). Wrong port number will
+         http://localhost:8080/ccm/content-center/
+
+     Be aware: the previous ccm-scripts based environment used
+     port 9000 by default. May be still specified in your
+     bundle file (integration.properties). Wrong port number will
      result in a stylesheet compilation error during server startup!
 
 (k)  ant create-war 
diff --git a/tools-ng/ecdc/bin/ccm.cmd b/tools-ng/ecdc/bin/ccm.cmd
new file mode 100644
index 000000000..76cd9f4bc
--- /dev/null
+++ b/tools-ng/ecdc/bin/ccm.cmd
@@ -0,0 +1 @@
+ant -f %~dp0\..\..\..\build.xml ccm -Dccm.parameters="%*"
diff --git a/tools-ng/ecdc/project.xml.complete b/tools-ng/ecdc/project.xml.complete
index ba7ebec2d..7dbb772e9 100644
--- a/tools-ng/ecdc/project.xml.complete
+++ b/tools-ng/ecdc/project.xml.complete
@@ -80,9 +80,6 @@
 		<ccm:application name="ccm-ldn-util"/>
 		<ccm:application name="ccm-simplesurvey"/>
 		<ccm:application name="ccm-user-preferences"/>
-        <ccm:application name="ccm-portlet"/>
-        <ccm:application name="ccm-portlet-helloworld"/>
-        <ccm:application name="ccm-portlet-content-item"/>
 	</ccm:build>
 
   <!-- List all shared, pre-built applications here -->
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml
index ebfc344ca..735c67bc8 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml
@@ -177,4 +177,16 @@
         </copy>
     </target>
 
+    <target name="ccm">
+        <echo>ccm ${ccm.parameters}</echo>
+        <java classname="com.arsdigita.packaging.MasterTool" fork="yes">
+            <classpath>
+                <path refid="ccm.tools.classpath" />
+                <pathelement location="${app.server.webapp.dir}/ROOT/WEB-INF/classes" />
+                <fileset dir="${app.server.webapp.dir}/ROOT/WEB-INF/lib" includes="**/*.jar" />
+            </classpath>
+            <sysproperty key="ccm.home" value="${ccm.home}" />
+            <arg line="${ccm.parameters}" />
+        </java>
+    </target>
 </project>
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml.orig b/tools-ng/ecdc/scriptlib/build-ccm.xml.orig
index 06a26aa73..7e6d5b88e 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml.orig
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml.orig
@@ -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>
  	
@@ -161,4 +177,11 @@
         </copy>
     </target>
 
+    <target name="ccm" depends="prepare-load">
+        <echo>ccm ${ccm.parameters}</echo>
+        <java classname="com.arsdigita.packaging.MasterTool" classpathref="ccm.classpath" fork="yes">
+            <sysproperty key="ccm.home" value="${ccm.home}" />
+            <arg line="${ccm.parameters}" />
+        </java>
+    </target>
 </project>