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

@@ -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. 
 

tools-ng/ecdc/bin/ccm.cmd

@@ -0,0 +1 @@
+ant -f %~dp0\..\..\..\build.xml ccm -Dccm.parameters="%*"

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 -->

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>

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>