LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dokumentation zu load task, Debugger awareness bei load ant tasks eingebaut, so dass jetzt auch der load step per debugger verfolgt werden kann. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1113 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-09-09 08:52:53 +00:00
parent ba3b7bda89
commit f4e0632ce2
3 changed files with 84 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ccm-core/src/com/arsdigita/packaging/Load.java
View File

@ -81,15 +81,38 @@ import org.apache.log4j.Logger;
* configuration registry
* Options: [-usage] Display a usage message for load command
* [-help|--help] Display a help message for load command
* [--packagekeys-file FILE] Reads list of packages to load from
* File (in addition to command line)
* [--schema] Loads just the schema for a package into the
* database, no data, no initializer
* [--data] Loads just data into the database, schema must exist
* already, initializers are not recorded
* [--init] Records the initializer and classes into database
* [--config] Creates entries in the registry (configuration repo)
* if set prevents any of the three data load steps
* described before to be executed!
* [--interactive] Ask interactively for config key values
* [--parameters KEY=VALUE ...] configuration parameter from
* command line.
* [--parameter-file FILE] Alternativly reads config parameters
* from FILE (multiple entries allowed).
* [--recursive] Recursively load required packages
* [--data]
* [--config]
* [--interactive]
* [--schema]
* [--parameters KEY=VALUE ...]
* [--init]
* [--parameter-file FILE]
*
* If neither of the options --config --schema --data --init is set, all four
* steps are performed (i.e. the usual loading step), e.g.
* <code> ccm load [ListOfPackages]</code>. Regarding configuration, if no
* additional configuration options are given (either on command line or a
* configuration file) the packages are just added to registry.properties
* (list of installed packages) and using eventually build in defaults (otherwise
* fails) during runtime.
* If one of the four parameters is set, none of the other tasks is executed
* implicitely but each desired step of the four must be explicitely specified!
*
* If new package(s) should just be loaded into the datbase without touching the
* configuration registry, --schema --data --init must be performed.
* <code>ccm load --schema --data --init [newPackage(s)]</code>
* May be necessary for an update which contains new modules already configured
* in the registry but missing in the (old) database.
*
* @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
* @version $Id: Load.java 736 2005-09-01 10:46:05Z sskracic $

65
tools-ng/ecdc/scriptlib/build-ccm.xml
View File

@ -12,12 +12,13 @@
<project name="load">
<target name="load-bundle" depends="prepare-load">
<echo>Loading bundle ${this.bundle.folder} into ${ccm.home}</echo>
<echo>Loading bundle from ${this.bundle.folder} into ${ccm.home}</echo>
<java classname="com.arsdigita.packaging.MasterTool" fork="true">
<classpath refid="ccm.classpath" />
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load --packagekeys-file ${this.bundle.folder}/cfg/package-key.list --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
@ -28,39 +29,32 @@
<classpath refid="ccm.classpath" />
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load --packagekeys-file ${this.bundle.folder}/cfg/package-key.list --interactive --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
<target name="load-bundle-config" depends="prepare-load">
<echo>load ${applications} --init using ${this.bundle.folder}/cfg/integration.properties</echo>
<echo>Registers configuration from ${this.bundle.folder} for ${applications} into registry</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true">
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load ${applications} --config --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
<target name="load-bundle-config-interactive" depends="prepare-load">
<echo>load ${applications} --init using ${this.bundle.folder}/cfg/integration.properties</echo>
<echo>Registers configuration from ${this.bundle.folder} for ${applications} into registry, aksing interactivly for values.</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true" >
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load ${applications} --config --interactive --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
<target name="load-bundle-data" depends="prepare-load">
<echo>load data only executing</echo>
<echo>load --data ${applications}</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true">
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load --data ${applications}" />
</java>
</target>
<target name="load" depends="prepare-load">
<echo>load ${applications} </echo>
<echo>load ${applications} without further configuration specifications but using build in defaults.</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true">
<sysproperty key="ccm.home" value="${ccm.home}" />
@ -71,15 +65,39 @@
value="${java.protocol.handler.pkgs}" />
-->
<arg line="load ${applications} " />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
<target name="load-schema" depends="prepare-load">
<echo>load schema only for ${applications} </echo>
<echo>load --data ${applications}</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true">
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load --data ${applications}" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
<target name="load-data" depends="prepare-load">
<echo>load data only for ${applications} </echo>
<echo>load --data ${applications}</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true">
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load --data ${applications}" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
<target name="load-init" depends="prepare-load">
<echo>load --init ${applications}</echo>
<echo>load initializers for ${applications} (--init )</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="true">
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="load --data ${applications}" />
<arg line="load --schema ${applications}" />
<jvmarg value="${app.server.debugger}" />
</java>
</target>
@ -119,6 +137,21 @@
<!-- <fileset dir="runtime/apache-tomcat-6.0.18/webapps/ROOT/WEB-INF/lib" includes="**/*.jar" /> -->
<fileset dir="${app.server.webapp.dir}/ROOT/WEB-INF/lib" includes="**/*.jar" />
</path>
<!-- Check configuration of debug option and set property appropriately -->
<if>
<equals arg1="${app.server.debug.on}" arg2="true" />
<then>
<property name="app.server.debugger"
value="-agentlib:jdwp=transport=dt_socket,server=y,address=${app.server.debug.port},suspend=${app.server.debug.suspend}" />
</then>
<else>
<!-- dummy value required to start tomcat successfully -->
<property name="app.server.debugger"
value="-showversion" />
</else>
</if>
</target>

10
tools-ng/ecdc/scriptlib/build-runtime.xml
View File

@ -32,11 +32,6 @@
<copy file="tools-ng/devel/lib/postgresql-jdbc.jar"
todir="${app.server.shared.dir}" preservelastmodified="true"/>
</target>
<target name="uninstall-liferay">
<echo>Uninstalling Liferay from ${app.server.webapp.dir}</echo>
<delete dir="${app.server.webapp.dir}/portal"/>
</target>
<target name="install-liferay" depends="uninstall-liferay">
<echo>Installing Liferay into ${app.server.webapp.dir}</echo>
@ -53,6 +48,11 @@
<copy file="tools-ng/liferay/jta.jar"
todir="${app.server.home.dir}/lib" preservelastmodified="true"/>
</target>
<target name="uninstall-liferay">
<echo>Uninstalling Liferay from ${app.server.webapp.dir}</echo>
<delete dir="${app.server.webapp.dir}/portal"/>
</target>
<target name="start" description="Start the Tomcat server">
<if>