[Bedework-commit] bedework r1914 - in trunk: . build
build/quickstart config/bwbuild/default config/configs
svnadmin at bedework.org
svnadmin at bedework.org
Sat Aug 9 00:42:23 EDT 2008
Author: douglm
Date: 2008-08-09 00:42:18 -0400 (Sat, 09 Aug 2008)
New Revision: 1914
Added:
trunk/build/quickstart/
trunk/build/quickstart/build.xml
trunk/build/quickstart/run-dir.xml
trunk/build/quickstart/run-hsqldb.xml
trunk/build/quickstart/run-tomcat.xml
Removed:
trunk/build/quickstart-build.xml
Modified:
trunk/build.xml
trunk/build/bw
trunk/config/bwbuild/default/cal.properties
trunk/config/configs/democal.properties
Log:
Break up the buildfile into a few chunks, hsql, tomcat and new directory stuff.
Add more code to manipulate an ldap directory - some code to initialise a new directory and add the initial ous and accounts.
Modified: trunk/build/bw
===================================================================
--- trunk/build/bw 2008-08-08 01:38:49 UTC (rev 1913)
+++ trunk/build/bw 2008-08-09 04:42:18 UTC (rev 1914)
@@ -8,8 +8,8 @@
echo ""
echo ""
echo " Bedework Calendar System"
-ECHO " ------------------------"
-ECHO ""
+echo " ------------------------"
+echo ""
PRG="$0"
Added: trunk/build/quickstart/build.xml
===================================================================
--- trunk/build/quickstart/build.xml (rev 0)
+++ trunk/build/quickstart/build.xml 2008-08-09 04:42:18 UTC (rev 1914)
@@ -0,0 +1,241 @@
+<?xml version="1.0"?>
+
+<!-- This is the ant build file for the bedework Calendar quickstart.
+
+ It is imported by the quickstart build.xml ensuring all changes to this file
+ appear in the repository.
+
+ Authors: Mike Douglass douglm at rpi.edu
+-->
+
+<project name="quickstart-build-file" default="usage" basedir=".">
+ <property environment="env"/>
+
+ <dirname property="bedework.quickstart.basedir" file="${ant.file.quickstart-build-file}"/>
+
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+ <import file="${bedework.quickstart.basedir}/run-hsqldb.xml" />
+ <import file="${bedework.quickstart.basedir}/run-tomcat.xml" />
+ <import file="${bedework.quickstart.basedir}/run-dir.xml" />
+
+ <target name="README" depends="init"
+ description="Describe targets and their usage">
+ <loadfile property="org.bedework.README" srcFile="${org.bedework.calendar.dir}/docs/README"/>
+ <echo message="${org.bedework.README}" />
+ </target>
+
+ <target name="usage" depends="init"
+ description="Describe targets and their usage">
+ <echo message="As distributed the package should be ready to go."/>
+ <echo message="Ensure ant is on your path, (a version is in the" />
+ <echo message="package)"/>
+ <echo message=""/>
+ <echo message="First in one window do"/>
+ <echo message=" ant hsqldb"/>
+ <echo message="This will start the hsqldb server ready for the "/>
+ <echo message="application."/>
+ <echo message=""/>
+ <echo message="In another window do"/>
+ <echo message=" ant tomcatstart"/>
+ <echo message=""/>
+ <echo message="Once tomcat is running you should be able to go to a"/>
+ <echo message="browser and connect to"/>
+ <echo message=" http://localhost:8080/bedework"/>
+ <echo message="and follow the instructions."/>
+ <echo message=""/>
+ <echo message="To build the calendar do"/>
+ <echo message=" ant deploy or "/>
+ <echo message=" ant deploy.debug "/>
+ <echo message="which does a build and deploy of all components"/>
+ <echo message=""/>
+ <echo message="To rebuild the calendar do"/>
+ <echo message=" ant clean.deploy or "/>
+ <echo message=" ant clean.deploy.debug "/>
+ <echo message="which does a clean, build and deploy of all components"/>
+ <echo message=""/>
+ <echo message="See documentation in the docs directory or on bedework.org"/>
+ <echo message="for instructions on creating a locally configured calendar application"/>
+ <echo message=""/>
+ </target>
+
+ <!-- The only properties set below should be those directly used to
+ invoke the targets below, in this file.
+ Do not set properties here for tasks invoked in other build
+ files. Instead, make sure the targets work in calendar/build.xml,
+ then invoke ant on the task in calendar/build.xml.
+
+ For an example, of invoking ant on another build file,
+ see the deploy target, below.
+ -->
+ <target name="init" >
+ <dirname property="quickstart.dir" file="${ant.file}"/>
+
+ <property name="org.bedework.project.bedework"
+ location="${basedir}/bedework" />
+
+ <property name="org.bedework.config.base"
+ location="${org.bedework.project.bedework}/config" />
+
+ <property name="bedework.build.file"
+ location="${basedir}/bedework/build.xml" />
+ <property name="org.bedework.user.build.properties"
+ location="${user.home}/bedework.build.properties" />
+ <dirname property="org.bedework.configuration.location"
+ file="${org.bedework.user.build.properties}" />
+
+ <echo message="Load user properties from ${org.bedework.user.build.properties}" />
+
+ <!-- Load user property definition overrides -->
+ <property file="${org.bedework.user.build.properties}" />
+
+ <!-- This may have defined the config properties location. Load that now to get overrides -->
+ <property file="${org.bedework.config.properties}" />
+
+
+ <!-- Unfortunately it sits on top of everything
+ <splash imageurl="file://${org.bedework.project.bedework}/docs/icons/bedeworkLogo.gif"/>
+ -->
+ </target>
+
+ <target name="run.init" depends="init" >
+ <property name="org.bedework.user.build.properties"
+ location="${user.home}/bedework.build.properties" />
+
+ <echo message="Load user properties from ${org.bedework.user.build.properties}" />
+
+ <!-- Load user property definition overrides -->
+ <property file="${org.bedework.user.build.properties}" />
+
+ <!-- ==================== config properties ========================= -->
+ <property name="org.bedework.config.properties"
+ location="${org.bedework.config.base}/configs/democal.properties" />
+ <property name="org.bedework.config.options"
+ location="${org.bedework.config.base}/configs/democal.options.xml" />
+
+ <echo message="==========================================================" />
+ <echo message="Use config properties ${org.bedework.config.properties}" />
+ <loadproperties
+ srcFile="${org.bedework.config.properties}" >
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadproperties>
+ </target>
+
+ <!-- =================================================================
+ The "build" target builds the jar files
+ ================================================================= -->
+
+ <target name="build" depends="init"
+ description="builds the jars">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="build" />
+ <tstamp prefix="endbuild" />
+ <echo message="=================> Build finished at ${endbuild.TODAY}" />
+ </target>
+
+ <target name="clean.build" depends="clean"
+ description="cleans then builds the jars">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="clean.build" />
+ </target>
+
+ <!-- =================================================================
+ The "deploy" target builds and deploys the applications
+ ================================================================= -->
+
+ <target name="deploy" depends="init"
+ description="builds and deploys the applications">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="deploy" />
+ </target>
+
+ <target name="deploy.debug" depends="init"
+ description="builds and deploys the applications">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="deploy.debug" />
+ <tstamp>
+ <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
+ </tstamp>
+
+ <echo message="=================> deploy.debug finished at ${deploydebug.time}" />
+ </target>
+
+ <!-- =================================================================
+ The "clean.deploy" target cleans, builds and deploys the applications
+ ================================================================= -->
+
+ <target name="clean" depends="init"
+ description="Remove all generated files.">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="clean" />
+ </target>
+
+ <target name="quickstart-clean" depends="init"
+ description="partial clean up for quickstart.">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="quickstart-clean" />
+ </target>
+
+ <target name="clean.deploy" depends="init"
+ description="builds and deploys the applications">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="clean.deploy" />
+ </target>
+
+ <target name="clean.deploy.debug" depends="init"
+ description="builds and deploys the applications">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="clean.deploy.debug" />
+ </target>
+
+ <!-- =================================================================
+ The "build.configured" target builds configured applications
+ ================================================================= -->
+
+ <target name="build.configured" depends="init"
+ description="Build configured applications" >
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="build.configured" />
+ </target>
+
+ <target name="build.configured.debug" depends="init"
+ description="Build configured applications" >
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="build.configured.debug" />
+ </target>
+
+ <target name="clean.build.configured" depends="init"
+ description="Build configured applications" >
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="clean.build.configured" />
+ </target>
+
+ <target name="clean.build.configured.debug" depends="init"
+ description="Build configured applications" >
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="clean.build.configured.debug" />
+ </target>
+
+ <!-- =================================================================
+ The "javadoc" target builds javadocs for all projects
+ ================================================================= -->
+
+ <target name="javadoc" depends="init"
+ description="Build javadocs" >
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="javadoc" />
+ </target>
+
+ <!-- =================================================================
+ Build and run the directory tools
+ ================================================================= -->
+
+ <target name="initDir" depends="init"
+ description="Build and run directory init">
+ <ant antfile="${bedework.build.file}" inheritrefs="true"
+ target="initDir" />
+ </target>
+
+</project>
Added: trunk/build/quickstart/run-dir.xml
===================================================================
--- trunk/build/quickstart/run-dir.xml (rev 0)
+++ trunk/build/quickstart/run-dir.xml 2008-08-09 04:42:18 UTC (rev 1914)
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<!-- Run hsqldb for the bedework Calendar quickstart.
+
+ This is imported by the quickstart build.xml ensuring all changes to this file
+ appear in the repository.
+
+ Authors: Mike Douglass douglm - rpi.edu
+-->
+
+<project name="quickstart-run-dir" default="dirstart" basedir=".">
+ <!-- This target normally overriden by the importing build.xml -->
+ <target name="run.init">
+ <property name="org.bedework.project.bedework"
+ location="${basedir}/bedework" />
+
+ <property name="org.bedework.directory.dir"
+ location="${org.bedework.project.bedework}/../apacheds-1.5.3.fixed" />
+ </target>
+
+ <!-- =================================================================
+ The "hsqldb" target starts the hsqldb server
+ ================================================================= -->
+
+ <target name="dirstart" depends="run.init"
+ description="starts the directory server">
+ <echo message="Starting directory"/>
+ <java fork="true" dir="${org.bedework.directory.dir}"
+ classname="org.apache.directory.server.UberjarMain">
+ <classpath>
+ <fileset dir="${org.bedework.directory.dir}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ <jvmarg value="-Dlog4j.configuration=file:conf/log4j.properties" />
+ <jvmarg value="-Dapacheds.log.dir=${org.bedework.directory.dir}/logs" />
+ <arg value="conf/server.xml"/>
+ </java>
+ </target>
+
+ <!-- =================================================================
+ The "dstool" target runs the directory server tool which
+ allows dump/restore and configuration.
+ ================================================================= -->
+
+ <target name="dstool" depends="run.init"
+ description="Runs the directory tool">
+ <echo message="Starting dstool"/>
+ <java fork="true" dir="${org.bedework.directory.dir}"
+ jar="${org.bedework.directory.dir}/bin/apacheds-tools.jar">
+ <arg value="-i ${org.bedework.directory.dir}"/>
+ <arg value="--configuration" />
+ <arg value="--help" />
+ </java>
+ </target>
+
+ <!-- =================================================================
+ The "dirclient" target runs the directory server client which
+ provides a gui interface to the running directory.
+ ================================================================= -->
+
+ <target name="dirclient" depends="run.init"
+ description="Runs the directory client">
+ <echo message="Starting hsqldb DatabaseManager"/>
+ <echo message="Select type: HSQL Database Engine Server"/>
+ <echo message="Set the URL to jdbc:hsqldb:hsql://localhost:8887"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.hsqldb.util.DatabaseManager">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ </java>
+ </target>
+</project>
Added: trunk/build/quickstart/run-hsqldb.xml
===================================================================
--- trunk/build/quickstart/run-hsqldb.xml (rev 0)
+++ trunk/build/quickstart/run-hsqldb.xml 2008-08-09 04:42:18 UTC (rev 1914)
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+
+<!-- Run hsqldb for the bedework Calendar quickstart.
+
+ This is imported by the quickstart build.xml ensuring all changes to this file
+ appear in the repository.
+
+ Authors: Mike Douglass douglm - rpi.edu
+-->
+
+<project name="quickstart-run-hsqldb" default="hsqldb" basedir=".">
+ <!-- This target normally overriden by the importing build.xml -->
+ <target name="run.init">
+ <property name="org.bedework.project.bedework"
+ location="${basedir}/bedework" />
+
+ <property name="org.bedework.hsqldb.dir"
+ location="${org.bedework.project.bedework}/../hsqldb-1.7.3.3" />
+ </target>
+
+ <!-- =================================================================
+ The "hsqldb" target starts the hsqldb server
+ ================================================================= -->
+
+ <target name="hsqldb" depends="run.init"
+ description="starts the hsqldb server">
+ <echo message="Starting hsqldb"/>
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-database"/>
+ <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/>
+ <arg value="-port"/>
+ <arg value="8887"/>
+ </java>
+ </target>
+
+ <target name="hsqldb-trace" depends="run.init"
+ description="starts the hsqldb server">
+ <echo message="Starting hsqldb"/>
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-trace"/>
+ <arg value="true"/>
+ <arg value="-silent"/>
+ <arg value="false"/>
+ <arg value="-database"/>
+ <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/>
+ <arg value="-port"/>
+ <arg value="8887"/>
+ </java>
+ </target>
+
+ <target name="hsqldb-trace-9887" depends="run.init"
+ description="starts the hsqldb server">
+ <echo message="Starting hsqldb"/>
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-trace"/>
+ <arg value="true"/>
+ <arg value="-silent"/>
+ <arg value="false"/>
+ <arg value="-database"/>
+ <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/>
+ <arg value="-port"/>
+ <arg value="9887"/>
+ </java>
+ </target>
+
+ <target name="uportaldb" depends="run.init"
+ description="starts the hsqldb server">
+ <echo message="Starting hsqldb"/>
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-database"/>
+ <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.uportal2.dbname}"/>
+ <arg value="-port"/>
+ <arg value="9887"/>
+ </java>
+ </target>
+
+ <!-- =================================================================
+ The "hsqldb-test" target starts the hsqldb server for testing
+ ================================================================= -->
+
+ <target name="hsqldb-test" depends="run.init"
+ description="starts the hsqldb server for testing">
+ <echo message="Starting hsqldb for testing"/>
+ <delete dir="${org.bedework.hsqldb.dbdir}" />
+
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-database"/>
+ <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.test.dbdir}/events"/>
+ <arg value="-port"/>
+ <arg value="8887"/>
+ </java>
+ </target>
+
+ <target name="hsqldb-test-trace" depends="run.init"
+ description="starts the hsqldb server for testing">
+ <echo message="Starting hsqldb for testing"/>
+ <delete dir="${org.bedework.hsqldb.dbdir}" />
+
+ <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ <arg value="-trace"/>
+ <arg value="true"/>
+ <arg value="-silent"/>
+ <arg value="false"/>
+ <arg value="-database"/>
+ <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.test.dbdir}/events"/>
+ <arg value="-port"/>
+ <arg value="8887"/>
+ </java>
+ </target>
+
+ <!-- =================================================================
+ The "hsqldb-mngr" target runs the DatabaseManager class which
+ provides a gui interface to the running hsqldb database.
+ ================================================================= -->
+
+ <target name="hsqldb-mngr" depends="run.init"
+ description="Runs the DatabaseManager class which provides a
+ gui interface to the running hsqldb database">
+ <echo message="Starting hsqldb DatabaseManager"/>
+ <echo message="Select type: HSQL Database Engine Server"/>
+ <echo message="Set the URL to jdbc:hsqldb:hsql://localhost:8887"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.hsqldb.util.DatabaseManager">
+ <classpath>
+ <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
+ </classpath>
+ </java>
+ </target>
+</project>
Added: trunk/build/quickstart/run-tomcat.xml
===================================================================
--- trunk/build/quickstart/run-tomcat.xml (rev 0)
+++ trunk/build/quickstart/run-tomcat.xml 2008-08-09 04:42:18 UTC (rev 1914)
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+
+<!-- Run hsqldb for the bedework Calendar quickstart.
+
+ This is imported by the quickstart build.xml ensuring all changes to this file
+ appear in the repository.
+
+ Authors: Mike Douglass douglm - rpi.edu
+-->
+
+<project name="quickstart-run-tomcat" default="tomcatstart" basedir=".">
+ <!-- This target normally overriden by the importing build.xml -->
+ <target name="run.init">
+ <property name="org.bedework.project.bedework"
+ location="${basedir}/bedework" />
+
+ <property name="org.bedework.appserver.dir"
+ location="${org.bedework.project.bedework}/../apache-tomcat-5.5.17" />
+ </target>
+
+ <!-- =================================================================
+ The "tomcatstart" target starts Tomcat
+ ================================================================= -->
+
+ <target name="tomcatstart-locale" depends="run.init"
+ description="starts the tomcat server">
+ <input message="Enter language code: "
+ addproperty="tomcat.locale" />
+
+ <input message="Enter country code: "
+ addproperty="tomcat.country" />
+
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Duser.language=${tomcat.locale}"/>
+ <jvmarg value="-Duser.country=${tomcat.country}"/>
+ <!--
+ <jvmarg value="-Dfile.encoding=ISO-8859-1"/>
+ -->
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <target name="tomcatstart" depends="run.init"
+ description="starts the tomcat server">
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx630m" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <jvmarg value="-Dfile.encoding=UTF-8"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <target name="tomcatstart-large" depends="run.init"
+ description="starts a large memory version of the tomcat server">
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx1028m" />
+ <jvmarg value="-XX:PermSize=128m" />
+ <jvmarg value="-XX:MaxPermSize=128m" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <target name="tomcatstart-profile" depends="run.init"
+ description="starts the tomcat server with rpofiling">
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Xrunyjpagent:cpu=times,onexit=cpu" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <target name="tomcatstart-profile-large" depends="run.init"
+ description="starts the tomcat server with rpofiling">
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx1028m" />
+ <jvmarg value="-XX:PermSize=128m" />
+ <jvmarg value="-XX:MaxPermSize=128m" />
+ <jvmarg value="-server" />
+ <jvmarg value="-agentlib:hprof=cpu=samples,depth=15,onexit=memory" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <target name="tomcatstart-profile-yk" depends="run.init"
+ description="starts the tomcat server with rpofiling">
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <echo message="For this to work you need to do something like:"/>
+ <echo message="export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/douglm/drop2/java/yourkit/yjp-6.0.15/bin/linux-x86-32"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx1028m" />
+ <jvmarg value="-XX:PermSize=128m" />
+ <jvmarg value="-XX:MaxPermSize=128m" />
+ <jvmarg value="-server" />
+ <jvmarg value="-agentlib:yjpagent" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <target name="tomcatstart-debug" depends="run.init"
+ description="starts the tomcat server with remote debugging enabled">
+ <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <!-- This target is for use when sync4j is installed -->
+ <target name="tomcatstart-sync4j" depends="run.init"
+ description="starts the tomcat server with sync4j">
+ <echo message="Starting Tomcat with sync4j"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <jvmarg value="-Dsync4j.home=${sync4j.dir}"/>
+ <arg value="start"/>
+ </java>
+ </target>
+
+ <!-- =================================================================
+ The "tomcatstop" target stops Tomcat cleanly
+ ================================================================= -->
+
+ <target name="tomcatstop" depends="run.init">
+ <echo message="Stopping Tomcat"/>
+ <java fork="true" dir="${basedir}"
+ classname="org.apache.catalina.startup.Bootstrap">
+ <classpath>
+ <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
+ </classpath>
+ <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
+ <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
+ <arg value="stop"/>
+ </java>
+ </target>
+</project>
Deleted: trunk/build/quickstart-build.xml
===================================================================
--- trunk/build/quickstart-build.xml 2008-08-08 01:38:49 UTC (rev 1913)
+++ trunk/build/quickstart-build.xml 2008-08-09 04:42:18 UTC (rev 1914)
@@ -1,527 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This is the ant build file for the bedework Calendar quickstart.
-
- It is imported by the quickstart build.xml ensuring all changes to this file
- appear in the repository.
-
- Authors: Mike Douglass douglm at rpi.edu
--->
-
-<project name="quickstart-build-file" default="usage" basedir=".">
- <property environment="env"/>
-
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
- <target name="README" depends="init"
- description="Describe targets and their usage">
- <loadfile property="org.bedework.README" srcFile="${org.bedework.calendar.dir}/docs/README"/>
- <echo message="${org.bedework.README}" />
- </target>
-
- <target name="usage" depends="init"
- description="Describe targets and their usage">
- <echo message="As distributed the package should be ready to go."/>
- <echo message="Ensure ant is on your path, (a version is in the" />
- <echo message="package)"/>
- <echo message=""/>
- <echo message="First in one window do"/>
- <echo message=" ant hsqldb"/>
- <echo message="This will start the hsqldb server ready for the "/>
- <echo message="application."/>
- <echo message=""/>
- <echo message="In another window do"/>
- <echo message=" ant tomcatstart"/>
- <echo message=""/>
- <echo message="Once tomcat is running you should be able to go to a"/>
- <echo message="browser and connect to"/>
- <echo message=" http://localhost:8080/bedework"/>
- <echo message="and follow the instructions."/>
- <echo message=""/>
- <echo message="To build the calendar do"/>
- <echo message=" ant deploy or "/>
- <echo message=" ant deploy.debug "/>
- <echo message="which does a build and deploy of all components"/>
- <echo message=""/>
- <echo message="To rebuild the calendar do"/>
- <echo message=" ant clean.deploy or "/>
- <echo message=" ant clean.deploy.debug "/>
- <echo message="which does a clean, build and deploy of all components"/>
- <echo message=""/>
- <echo message="See documentation in the docs directory or on bedework.org"/>
- <echo message="for instructions on creating a locally configured calendar application"/>
- <echo message=""/>
- </target>
-
- <!-- The only properties set below should be those directly used to
- invoke the targets below, in this file.
- Do not set properties here for tasks invoked in other build
- files. Instead, make sure the targets work in calendar/build.xml,
- then invoke ant on the task in calendar/build.xml.
-
- For an example, of invoking ant on another build file,
- see the deploy target, below.
- -->
- <target name="init" >
- <dirname property="quickstart.dir" file="${ant.file}"/>
-
- <property name="org.bedework.project.bedework"
- location="${basedir}/bedework" />
-
- <property name="org.bedework.config.base"
- location="${org.bedework.project.bedework}/config" />
-
- <property name="bedework.build.file"
- location="${basedir}/bedework/build.xml" />
- <property name="org.bedework.user.build.properties"
- location="${user.home}/bedework.build.properties" />
- <dirname property="org.bedework.configuration.location"
- file="${org.bedework.user.build.properties}" />
-
- <echo message="Load user properties from ${org.bedework.user.build.properties}" />
-
- <!-- Load user property definition overrides -->
- <property file="${org.bedework.user.build.properties}" />
-
- <!-- This may have defined the config properties location. Load that now to get overrides -->
- <property file="${org.bedework.config.properties}" />
-
-
- <!-- Unfortunately it sits on top of everything
- <splash imageurl="file://${org.bedework.project.bedework}/docs/icons/bedeworkLogo.gif"/>
- -->
- </target>
-
- <target name="run.init" depends="init" >
- <property name="org.bedework.user.build.properties"
- location="${user.home}/bedework.build.properties" />
-
- <echo message="Load user properties from ${org.bedework.user.build.properties}" />
-
- <!-- Load user property definition overrides -->
- <property file="${org.bedework.user.build.properties}" />
-
- <!-- ==================== config properties ========================= -->
- <property name="org.bedework.config.properties"
- location="${org.bedework.config.base}/configs/democal.properties" />
- <property name="org.bedework.config.options"
- location="${org.bedework.config.base}/configs/democal.options.xml" />
-
- <echo message="==========================================================" />
- <echo message="Use config properties ${org.bedework.config.properties}" />
- <loadproperties
- srcFile="${org.bedework.config.properties}" >
- <filterchain>
- <expandproperties/>
- </filterchain>
- </loadproperties>
- </target>
-
- <!-- =================================================================
- The "build" target builds the jar files
- ================================================================= -->
-
- <target name="build" depends="init"
- description="builds the jars">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="build" />
- <tstamp prefix="endbuild" />
- <echo message="=================> Build finished at ${endbuild.TODAY}" />
- </target>
-
- <target name="clean.build" depends="clean"
- description="cleans then builds the jars">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="clean.build" />
- </target>
-
- <!-- =================================================================
- The "deploy" target builds and deploys the applications
- ================================================================= -->
-
- <target name="deploy" depends="init"
- description="builds and deploys the applications">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="deploy" />
- </target>
-
- <target name="deploy.debug" depends="init"
- description="builds and deploys the applications">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="deploy.debug" />
- <tstamp>
- <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/>
- </tstamp>
-
- <echo message="=================> deploy.debug finished at ${deploydebug.time}" />
- </target>
-
- <!-- =================================================================
- The "clean.deploy" target cleans, builds and deploys the applications
- ================================================================= -->
-
- <target name="clean" depends="init"
- description="Remove all generated files.">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="clean" />
- </target>
-
- <target name="quickstart-clean" depends="init"
- description="partial clean up for quickstart.">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="quickstart-clean" />
- </target>
-
- <target name="clean.deploy" depends="init"
- description="builds and deploys the applications">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="clean.deploy" />
- </target>
-
- <target name="clean.deploy.debug" depends="init"
- description="builds and deploys the applications">
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="clean.deploy.debug" />
- </target>
-
- <!-- =================================================================
- The "build.configured" target builds configured applications
- ================================================================= -->
-
- <target name="build.configured" depends="init"
- description="Build configured applications" >
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="build.configured" />
- </target>
-
- <target name="build.configured.debug" depends="init"
- description="Build configured applications" >
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="build.configured.debug" />
- </target>
-
- <target name="clean.build.configured" depends="init"
- description="Build configured applications" >
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="clean.build.configured" />
- </target>
-
- <target name="clean.build.configured.debug" depends="init"
- description="Build configured applications" >
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="clean.build.configured.debug" />
- </target>
-
- <!-- =================================================================
- The "javadoc" target builds javadocs for all projects
- ================================================================= -->
-
- <target name="javadoc" depends="init"
- description="Build javadocs" >
- <ant antfile="${bedework.build.file}" inheritrefs="true"
- target="javadoc" />
- </target>
-
- <!-- =================================================================
- The "hsqldb" target starts the hsqldb server
- ================================================================= -->
-
- <target name="hsqldb" depends="run.init"
- description="starts the hsqldb server">
- <echo message="Starting hsqldb"/>
- <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- <arg value="-database"/>
- <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/>
- <arg value="-port"/>
- <arg value="8887"/>
- </java>
- </target>
-
- <target name="hsqldb-trace" depends="run.init"
- description="starts the hsqldb server">
- <echo message="Starting hsqldb"/>
- <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- <arg value="-trace"/>
- <arg value="true"/>
- <arg value="-silent"/>
- <arg value="false"/>
- <arg value="-database"/>
- <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/>
- <arg value="-port"/>
- <arg value="8887"/>
- </java>
- </target>
-
- <target name="hsqldb-trace-9887" depends="run.init"
- description="starts the hsqldb server">
- <echo message="Starting hsqldb"/>
- <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- <arg value="-trace"/>
- <arg value="true"/>
- <arg value="-silent"/>
- <arg value="false"/>
- <arg value="-database"/>
- <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/>
- <arg value="-port"/>
- <arg value="9887"/>
- </java>
- </target>
-
- <target name="uportaldb" depends="run.init"
- description="starts the hsqldb server">
- <echo message="Starting hsqldb"/>
- <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- <arg value="-database"/>
- <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.uportal2.dbname}"/>
- <arg value="-port"/>
- <arg value="9887"/>
- </java>
- </target>
-
- <!-- =================================================================
- The "hsqldb-test" target starts the hsqldb server for testing
- ================================================================= -->
-
- <target name="hsqldb-test" depends="run.init"
- description="starts the hsqldb server for testing">
- <echo message="Starting hsqldb for testing"/>
- <delete dir="${org.bedework.hsqldb.dbdir}" />
-
- <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- <arg value="-database"/>
- <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.test.dbdir}/events"/>
- <arg value="-port"/>
- <arg value="8887"/>
- </java>
- </target>
-
- <target name="hsqldb-test-trace" depends="run.init"
- description="starts the hsqldb server for testing">
- <echo message="Starting hsqldb for testing"/>
- <delete dir="${org.bedework.hsqldb.dbdir}" />
-
- <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- <arg value="-trace"/>
- <arg value="true"/>
- <arg value="-silent"/>
- <arg value="false"/>
- <arg value="-database"/>
- <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.test.dbdir}/events"/>
- <arg value="-port"/>
- <arg value="8887"/>
- </java>
- </target>
-
- <!-- =================================================================
- The "hsqldb-mngr" target runs the DatabaseManager class which
- provides a gui interface to the running hsqldb database.
- ================================================================= -->
-
- <target name="hsqldb-mngr" depends="run.init"
- description="Runs the DatabaseManager class which provides a
- gui interface to the running hsqldb database">
- <echo message="Starting hsqldb DatabaseManager"/>
- <echo message="Select type: HSQL Database Engine Server"/>
- <echo message="Set the URL to jdbc:hsqldb:hsql://localhost:8887"/>
- <java fork="true" dir="${basedir}"
- classname="org.hsqldb.util.DatabaseManager">
- <classpath>
- <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/>
- </classpath>
- </java>
- </target>
-
- <!-- =================================================================
- The "tomcatstart" target starts Tomcat
- ================================================================= -->
-
- <target name="tomcatstart-locale" depends="run.init"
- description="starts the tomcat server">
- <input message="Enter language code: "
- addproperty="tomcat.locale" />
-
- <input message="Enter country code: "
- addproperty="tomcat.country" />
-
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Duser.language=${tomcat.locale}"/>
- <jvmarg value="-Duser.country=${tomcat.country}"/>
- <!--
- <jvmarg value="-Dfile.encoding=ISO-8859-1"/>
- -->
- <arg value="start"/>
- </java>
- </target>
-
- <target name="tomcatstart" depends="run.init"
- description="starts the tomcat server">
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx630m" />
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
- <jvmarg value="-Dfile.encoding=UTF-8"/>
- <arg value="start"/>
- </java>
- </target>
-
- <target name="tomcatstart-large" depends="run.init"
- description="starts a large memory version of the tomcat server">
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx1028m" />
- <jvmarg value="-XX:PermSize=128m" />
- <jvmarg value="-XX:MaxPermSize=128m" />
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
- <arg value="start"/>
- </java>
- </target>
-
- <target name="tomcatstart-profile" depends="run.init"
- description="starts the tomcat server with rpofiling">
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Xrunyjpagent:cpu=times,onexit=cpu" />
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
- <arg value="start"/>
- </java>
- </target>
-
- <target name="tomcatstart-profile-large" depends="run.init"
- description="starts the tomcat server with rpofiling">
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx1028m" />
- <jvmarg value="-XX:PermSize=128m" />
- <jvmarg value="-XX:MaxPermSize=128m" />
- <jvmarg value="-server" />
- <jvmarg value="-agentlib:hprof=cpu=samples,depth=15,onexit=memory" />
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
- <arg value="start"/>
- </java>
- </target>
-
- <target name="tomcatstart-profile-yk" depends="run.init"
- description="starts the tomcat server with rpofiling">
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <echo message="For this to work you need to do something like:"/>
- <echo message="export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/douglm/drop2/java/yourkit/yjp-6.0.15/bin/linux-x86-32"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx1028m" />
- <jvmarg value="-XX:PermSize=128m" />
- <jvmarg value="-XX:MaxPermSize=128m" />
- <jvmarg value="-server" />
- <jvmarg value="-agentlib:yjpagent" />
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
- <arg value="start"/>
- </java>
- </target>
-
- <target name="tomcatstart-debug" depends="run.init"
- description="starts the tomcat server with remote debugging enabled">
- <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"/>
- <arg value="start"/>
- </java>
- </target>
-
- <!-- This target is for use when sync4j is installed -->
- <target name="tomcatstart-sync4j" depends="run.init"
- description="starts the tomcat server with sync4j">
- <echo message="Starting Tomcat with sync4j"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <jvmarg value="-Dsync4j.home=${sync4j.dir}"/>
- <arg value="start"/>
- </java>
- </target>
-
- <!-- =================================================================
- The "tomcatstop" target stops Tomcat cleanly
- ================================================================= -->
-
- <target name="tomcatstop" depends="run.init">
- <echo message="Stopping Tomcat"/>
- <java fork="true" dir="${basedir}"
- classname="org.apache.catalina.startup.Bootstrap">
- <classpath>
- <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/>
- </classpath>
- <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/>
- <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/-->
- <arg value="stop"/>
- </java>
- </target>
-</project>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-08-08 01:38:49 UTC (rev 1913)
+++ trunk/build.xml 2008-08-09 04:42:18 UTC (rev 1914)
@@ -686,6 +686,16 @@
</target>
<!-- =================================================================
+ Build and run the directory tools
+ ================================================================= -->
+
+ <target name="initDir" depends="init"
+ description="Build and run directory init">
+ <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
+ target="initDir" />
+ </target>
+
+ <!-- =================================================================
Build and run the unit test suite
================================================================= -->
Modified: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties 2008-08-08 01:38:49 UTC (rev 1913)
+++ trunk/config/bwbuild/default/cal.properties 2008-08-09 04:42:18 UTC (rev 1914)
@@ -131,7 +131,15 @@
# ------------------------------------------------------------------------
# ------------------------------------------------------------------------
#
+
+#
# ------------------------------------------------------------------------
+# directory defs
+# ------------------------------------------------------------------------
+
+org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed
+
+# ------------------------------------------------------------------------
# hsqldb defs
# ------------------------------------------------------------------------
Modified: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties 2008-08-08 01:38:49 UTC (rev 1913)
+++ trunk/config/configs/democal.properties 2008-08-09 04:42:18 UTC (rev 1914)
@@ -131,7 +131,14 @@
# ------------------------------------------------------------------------
# ------------------------------------------------------------------------
#
+
# ------------------------------------------------------------------------
+# directory defs
+# ------------------------------------------------------------------------
+
+org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed
+
+# ------------------------------------------------------------------------
# hsqldb defs
# ------------------------------------------------------------------------
More information about the Bedework-commit
mailing list