Changeset 663
- Timestamp:
- 06/28/06 23:25:46
- Files:
-
- trunk/calendar3/bldfiles/buildwar.xml (modified) (1 diff)
- trunk/calendar3/bldfiles/defaultDefs.properties (added)
- trunk/calendar3/bldfiles/globalDefs.xml (modified) (5 diffs)
- trunk/calendar3/bldfiles/quickstart-build.xml (modified) (3 diffs)
- trunk/calendar3/build.properties (deleted)
- trunk/calendar3/build.xml (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/bldfiles/buildwar.xml
r659 r663 5 5 6 6 It is assumed that no changes will be made to this file. It should be 7 possible to make all changes needed by modifying the build.properties8 and app.properties files of the individual applications.7 possible to make all changes needed by modifying the configuration 8 properties or a bedework.build.proeprties file 9 9 10 10 An unwrapped web application will be built in the temp directory trunk/calendar3/bldfiles/globalDefs.xml
r659 r663 5 5 This file is imported by build files that want to define all the 6 6 global settings. It defines a globalDefs target 7 8 Do not edit this file - the only site configuration changes should be 9 made by creating a bedework.build.properties file in your home 10 directory and setting property overrides there. 11 12 See the documentation in the docs directory for details. 7 13 =================================================================== --> 8 14 … … 10 16 <property environment="env"/> 11 17 18 <!-- =============================================================== 19 Default properties. 20 =============================================================== --> 21 22 <property name="org.bedework.defaultdefs.properties" 23 location="${org.bedework.calendar.dir}/bldfiles/defaultDefs.properties"/> 24 12 25 <target name="globalDefs" > 13 <!-- This may already be set from calling dir -->14 <dirname property="calendar.dir" file="${ant.file}"/>15 16 26 <!-- This needs reinvestigating - there still seem to be problems with xalan 17 27 If this stays it should be a config property … … 41 51 <!-- Load user property definition overrides --> 42 52 <property file="${org.bedework.user.build.properties}" /> 43 <property file="${calendar.dir}/build.properties"/> 44 45 <!-- Name of the configuration property file --> 46 <property name="org.bedework.clone.default" value="democal" /> 47 48 <!-- =============================================================== 49 Properties derived from calendar.dir 50 =============================================================== --> 51 52 <property name="uwcal.home" location="${calendar.dir}" /> 53 54 <!-- =============================================================== 55 Default properties. 56 =============================================================== --> 57 58 <echo message="Load default properties from ${org.bedework.defaultdefs.properties}" /> 59 <property file="${org.bedework.defaultdefs.properties}" /> 60 61 <!-- =============================================================== 62 Properties derived from org.bedework.calendar.dir 63 =============================================================== --> 64 65 <property name="uwcal.home" location="${org.bedework.calendar.dir}" /> 53 66 54 67 <!-- This is the default location for the canoo files. 55 68 --> 56 <property name="webtest.home" location="${ calendar.dir}/../webtest" />69 <property name="webtest.home" location="${org.bedework.calendar.dir}/../webtest" /> 57 70 58 71 <!-- Where the web-apps skeletons, build files etc reside --> 59 <property name="apps.root.dir" location="${ calendar.dir}/apps" />60 <property name="cal.default.db" location="${ calendar.dir}/db" />61 <property name="org.bedework.default.lib" location="${ calendar.dir}/lib" />72 <property name="apps.root.dir" location="${org.bedework.calendar.dir}/apps" /> 73 <property name="cal.default.db" location="${org.bedework.calendar.dir}/db" /> 74 <property name="org.bedework.default.lib" location="${org.bedework.calendar.dir}/lib" /> 62 75 <property name="org.bedework.jdbc.lib" location="${org.bedework.default.lib}/jdbc" /> 63 <property name="html.dir" location="${ calendar.dir}/html" />76 <property name="html.dir" location="${org.bedework.calendar.dir}/html" /> 64 77 65 78 <!-- Component locations --> 66 79 67 <property name="org.bedework.access.base" location="${ calendar.dir}/access" />68 <property name="org.bedework.appcommon.base" location="${ calendar.dir}/appcommon" />69 <property name="org.bedework.caldav.base" location="${ calendar.dir}/caldav" />80 <property name="org.bedework.access.base" location="${org.bedework.calendar.dir}/access" /> 81 <property name="org.bedework.appcommon.base" location="${org.bedework.calendar.dir}/appcommon" /> 82 <property name="org.bedework.caldav.base" location="${org.bedework.calendar.dir}/caldav" /> 70 83 <property name="org.bedework.caldavClientApi.base" 71 location="${ calendar.dir}/caldavClientApi" />72 <property name="org.bedework.calenv.base" location="${ calendar.dir}/calEnv" />73 <property name="org.bedework.calfacade.base" location="${ calendar.dir}/calFacade" />74 <property name="org.bedework.calsvc.base" location="${ calendar.dir}/calsvc" />75 <property name="org.bedework.calsvci.base" location="${ calendar.dir}/calsvci" />76 <property name="org.bedework.common.base" location="${ calendar.dir}/common" />77 <property name="org.bedework.config.base" location="${ calendar.dir}/config" />78 <property name="org.bedework.core.base" location="${ calendar.dir}/calCore" />79 <property name="org.bedework.davdefs.base" location="${ calendar.dir}/davdefs" />80 <property name="org.bedework.deployment.base" location="${ calendar.dir}/deployment" />81 <property name="org.bedework.dumprestore.base" location="${ calendar.dir}/dumprestore" />82 <property name="org.bedework.http.base" location="${ calendar.dir}/http" />83 <property name="org.bedework.ical.base" location="${ calendar.dir}/icalendar" />84 <property name="org.bedework.locale.base" location="${ calendar.dir}/locale" />85 <property name="org.bedework.logging.base" location="${ calendar.dir}/logging" />86 <property name="org.bedework.mail.base" location="${ calendar.dir}/mail" />87 <property name="org.bedework.synchml.base" location="${ calendar.dir}/synchml" />88 <property name="org.bedework.testsuite.base" location="${ calendar.dir}/test" />89 <property name="org.bedework.timers.base" location="${ calendar.dir}/timers" />90 <property name="org.bedework.tools.base" location="${ calendar.dir}/tools" />91 <property name="org.bedework.uportal.base" location="${ calendar.dir}/uportal" />92 <property name="org.bedework.webadmin.base" location="${ calendar.dir}/webadmin" />93 <property name="org.bedework.webclient.base" location="${ calendar.dir}/webclient" />94 <property name="org.bedework.webcommon.base" location="${ calendar.dir}/webcommon" />95 <property name="org.bedework.webtest.base" location="${ calendar.dir}/webtest" />84 location="${org.bedework.calendar.dir}/caldavClientApi" /> 85 <property name="org.bedework.calenv.base" location="${org.bedework.calendar.dir}/calEnv" /> 86 <property name="org.bedework.calfacade.base" location="${org.bedework.calendar.dir}/calFacade" /> 87 <property name="org.bedework.calsvc.base" location="${org.bedework.calendar.dir}/calsvc" /> 88 <property name="org.bedework.calsvci.base" location="${org.bedework.calendar.dir}/calsvci" /> 89 <property name="org.bedework.common.base" location="${org.bedework.calendar.dir}/common" /> 90 <property name="org.bedework.config.base" location="${org.bedework.calendar.dir}/config" /> 91 <property name="org.bedework.core.base" location="${org.bedework.calendar.dir}/calCore" /> 92 <property name="org.bedework.davdefs.base" location="${org.bedework.calendar.dir}/davdefs" /> 93 <property name="org.bedework.deployment.base" location="${org.bedework.calendar.dir}/deployment" /> 94 <property name="org.bedework.dumprestore.base" location="${org.bedework.calendar.dir}/dumprestore" /> 95 <property name="org.bedework.http.base" location="${org.bedework.calendar.dir}/http" /> 96 <property name="org.bedework.ical.base" location="${org.bedework.calendar.dir}/icalendar" /> 97 <property name="org.bedework.locale.base" location="${org.bedework.calendar.dir}/locale" /> 98 <property name="org.bedework.logging.base" location="${org.bedework.calendar.dir}/logging" /> 99 <property name="org.bedework.mail.base" location="${org.bedework.calendar.dir}/mail" /> 100 <property name="org.bedework.synchml.base" location="${org.bedework.calendar.dir}/synchml" /> 101 <property name="org.bedework.testsuite.base" location="${org.bedework.calendar.dir}/test" /> 102 <property name="org.bedework.timers.base" location="${org.bedework.calendar.dir}/timers" /> 103 <property name="org.bedework.tools.base" location="${org.bedework.calendar.dir}/tools" /> 104 <property name="org.bedework.uportal.base" location="${org.bedework.calendar.dir}/uportal" /> 105 <property name="org.bedework.webadmin.base" location="${org.bedework.calendar.dir}/webadmin" /> 106 <property name="org.bedework.webclient.base" location="${org.bedework.calendar.dir}/webclient" /> 107 <property name="org.bedework.webcommon.base" location="${org.bedework.calendar.dir}/webcommon" /> 108 <property name="org.bedework.webtest.base" location="${org.bedework.calendar.dir}/webtest" /> 96 109 97 110 <!-- =============================================================== … … 115 128 =============================================================== --> 116 129 117 <property name="org.bedework.bld.home" location="${ calendar.dir}/bldfiles"/>118 <property name="dist.home" location="${ calendar.dir}/dist"/>130 <property name="org.bedework.bld.home" location="${org.bedework.calendar.dir}/bldfiles"/> 131 <property name="dist.home" location="${org.bedework.calendar.dir}/dist"/> 119 132 120 133 <!-- =============================================================== … … 122 135 =============================================================== --> 123 136 124 <property name="org.bedework.temp.home" location="${ calendar.dir}/temp"/>137 <property name="org.bedework.temp.home" location="${org.bedework.calendar.dir}/temp"/> 125 138 126 139 <!-- As application components are built, they copy any needed jars into trunk/calendar3/bldfiles/quickstart-build.xml
r659 r663 12 12 <property environment="env"/> 13 13 14 <property name="org.bedework.calendar.dir" 15 location="${basedir}/calendar3" /> 16 17 <!-- =============================================================== 18 Default properties. 19 =============================================================== --> 20 21 <property name="org.bedework.defaultdefs.properties" 22 location="${org.bedework.calendar.dir}/bldfiles/defaultDefs.properties"/> 23 14 24 <target name="README" depends="init" 15 25 description="Describe targets and their usage"> 16 <loadfile property="org.bedework.README" srcFile="${ calendar.dir}/docs/README"/>26 <loadfile property="org.bedework.README" srcFile="${org.bedework.calendar.dir}/docs/README"/> 17 27 <echo message="${org.bedework.README}" /> 18 28 </target> … … 64 74 <dirname property="quickstart.dir" file="${ant.file}"/> 65 75 66 <property name="calendar.dir"67 location="${basedir}/calendar3" />68 69 76 <property name="calendar.build.file" 70 location="${ calendar.dir}/build.xml" />77 location="${org.bedework.calendar.dir}/build.xml" /> 71 78 72 79 <!-- Overriding this when invoking ant allows different user property … … 82 89 <property file="${org.bedework.user.build.properties}" /> 83 90 84 <!-- Then standard build properties --> 85 <property file="${calendar.dir}/build.properties"/> 86 87 <property name="org.bedework.hsqldb.dir" 88 location="${basedir}/hsqldb-1.7.3.3" /> 89 <property name="org.bedework.hsqldb.dbname" 90 value="demo/events" /> 91 <property name="org.bedework.hsqldb.uportal2.dbname" 92 value="uportal2/uportal" /> 93 <property name="org.bedework.hsqldb.test.dbdir" 94 value="test" /> 95 96 <property name="org.bedework.appserver.dir" 97 location="${basedir}/jakarta-tomcat-5.0.28" /> 91 <!-- =============================================================== 92 Default properties. 93 =============================================================== --> 94 <property file="${org.bedework.defaultdefs.properties}" /> 95 98 96 <property name="sync4j.dir" 99 97 location="${basedir}/Sync4j2.2b3" /> 100 101 <property name="org.bedework.appserver.deploy.dir"102 location="${org.bedework.appserver.dir}/webapps" />103 98 </target> 104 99 trunk/calendar3/build.xml
r659 r663 38 38 * Definitions from a "bedework.build.properties" file in the developer's 39 39 home directory 40 * Definitions from a "build.properties" file in the top level41 source directory42 40 * Default definitions in this build.xml file 43 41 … … 45 43 contents of previously defined properties. This is a powerful 46 44 technique that helps you minimize the number of changes required when 47 your development environment is modified. Note that property 48 composition is allowed within "build.properties" files as well as in 49 the "build.xml" script. 50 ================================================================= --> 51 52 <property name="org.bedework.globaldefs.file" value="bldfiles/globalDefs.xml"/> 45 your development environment is modified. 46 ================================================================= --> 47 48 <!-- This may already be set from calling dir --> 49 <dirname property="org.bedework.calendar.dir" file="${ant.file}"/> 50 51 <property name="org.bedework.globaldefs.file" 52 location="${org.bedework.calendar.dir}/bldfiles/globalDefs.xml"/> 53 53 <import file="${org.bedework.globaldefs.file}"/> 54 54 … … 185 185 <target name="deploy.log4j.xml" > 186 186 <copy todir="${log4j.config.destination}" 187 file="${ calendar.dir}/resources/log4j.xml"187 file="${org.bedework.calendar.dir}/resources/log4j.xml" 188 188 overwrite="${org.bedework.deploy.log4j.config}" /> 189 189 </target> … … 192 192 <target name="deploy.config" > 193 193 <copy todir="${log4j.config.destination}" 194 file="${ calendar.dir}/resources/log4j.xml"194 file="${org.bedework.calendar.dir}/resources/log4j.xml" 195 195 overwrite="${org.bedework.deploy.log4j.config}" /> 196 196 … … 774 774 775 775 <property name="quickstart.files.dir" 776 location="${ calendar.dir}/quickstartFiles"/>776 location="${org.bedework.calendar.dir}/quickstartFiles"/> 777 777 778 778 <copy todir="${org.bedework.appserver.dir}/conf" overwrite="yes"> … … 780 780 </copy> 781 781 782 <copy todir="${ calendar.dir}/.." overwrite="yes">782 <copy todir="${org.bedework.calendar.dir}/.." overwrite="yes"> 783 783 <fileset dir="${quickstart.files.dir}/root" /> 784 784 </copy> … … 791 791 792 792 <property name="quickstart.files.dir" 793 location="${ calendar.dir}/quickstartFiles"/>793 location="${org.bedework.calendar.dir}/quickstartFiles"/> 794 794 795 795 <copy todir="${org.bedework.appserver.dir}/common/lib" overwrite="yes"> 796 <fileset dir="${ calendar.dir}/lib/acegi"796 <fileset dir="${org.bedework.calendar.dir}/lib/acegi" 797 797 excludes="acegi-security-catalina-server.jar" /> 798 798 </copy> 799 799 800 800 <copy todir="${org.bedework.appserver.dir}/server/lib" overwrite="yes"> 801 <fileset dir="${ calendar.dir}/lib/acegi"801 <fileset dir="${org.bedework.calendar.dir}/lib/acegi" 802 802 includes="acegi-security-catalina-server.jar" /> 803 803 </copy> … … 809 809 file="${quickstart.files.dir}/tomcat.conf/acegisecurity.xml" /> 810 810 811 <copy todir="${ calendar.dir}/.." overwrite="yes">811 <copy todir="${org.bedework.calendar.dir}/.." overwrite="yes"> 812 812 <fileset dir="${quickstart.files.dir}/root" /> 813 813 </copy>
