Changeset 1807
- Timestamp:
- 04/04/08 13:54:46
- Files:
-
- trunk/build/buildsh.xml (modified) (1 diff)
- trunk/build/quickstart-build.xml (modified) (1 diff)
- trunk/config/bwbuild (copied) (copied from releases/bedework-3.4.1/config/bwbuild)
- trunk/config/bwbuild/jboss (copied) (copied from releases/bedework-3.4.1/config/bwbuild/jboss)
- trunk/config/bwbuild/jboss/build.properties (copied) (copied from releases/bedework-3.4.1/config/bwbuild/jboss/build.properties)
- trunk/config/bwbuild/jboss/democal.options.xml (copied) (copied from releases/bedework-3.4.1/config/bwbuild/jboss/democal.options.xml)
- trunk/config/bwbuild/jboss/democal.properties (copied) (copied from releases/bedework-3.4.1/config/bwbuild/jboss/democal.properties)
- trunk/deployment/resources/build.xml (modified) (1 diff)
- trunk/deployment/termination/jboss/build.xml (modified) (3 diffs)
- trunk/deployment/webadmin/jboss/build.xml (modified) (1 diff)
- trunk/deployment/webadmin/webapp/build.xml (modified) (1 diff)
- trunk/deployment/webconfig/jboss/build.xml (modified) (1 diff)
- trunk/deployment/webconfig/webapp/build.xml (modified) (1 diff)
- trunk/deployment/webpublic/jboss/build.xml (modified) (1 diff)
- trunk/deployment/websubmit/jboss/build.xml (modified) (1 diff)
- trunk/deployment/websubmit/webapp/build.xml (modified) (1 diff)
- trunk/deployment/webuser/jboss/build.xml (modified) (1 diff)
- trunk/deployment/webuser/webapp/build.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/buildsh.xml
r1429 r1807 112 112 113 113 <!-- Include the quickstart jdbc driver --> 114 <copy todir="${app.dest.lib}" file="${ hsqldb.jdbcdriver.jar}"/>114 <copy todir="${app.dest.lib}" file="${appserver.jdbcdriver.jar}"/> 115 115 116 116 <copy todir="${app.dest.classes}"> trunk/build/quickstart-build.xml
r1753 r1807 83 83 <!-- Load user property definition overrides --> 84 84 <property file="${org.bedework.user.build.properties}" /> 85 86 <!-- This may have defined the config properties location. Load that now to get overrides --> 87 <property file="${org.bedework.config.properties}" /> 88 85 89 86 90 <!-- Unfortunately it sits on top of everything trunk/deployment/resources/build.xml
r1193 r1807 105 105 </then> 106 106 <else> 107 <!-- Just copy into a common location -->108 <property name="cmn.destdir"109 location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/>110 107 <if> 111 <isset property="org.bedework.use.dojo" /> 108 <not> 109 <isset property="org.bedework.global.noskins" /> 110 </not> 112 111 <then> 113 <!-- Add dojo --> 114 <copy todir="${cmn.destdir}/javascript/dojo"> 115 <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 112 <!-- Just copy into a common location --> 113 <property name="cmn.destdir" 114 location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/> 115 <if> 116 <isset property="org.bedework.use.dojo" /> 117 <then> 118 <!-- Add dojo --> 119 <copy todir="${cmn.destdir}/javascript/dojo"> 120 <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 121 </copy> 122 </then> 123 </if> 124 125 <copy todir="${cmn.destdir}"> 126 <fileset dir="${common.resources.dir}/xsl" /> 116 127 </copy> 117 128 </then> 118 129 </if> 119 120 <copy todir="${cmn.destdir}">121 <fileset dir="${common.resources.dir}/xsl" />122 </copy>123 130 </else> 124 131 </if> trunk/deployment/termination/jboss/build.xml
r1765 r1807 9 9 <dirname property="this.dir" file="${ant.file}"/> 10 10 11 <property name="app.ear.file.name" 12 value="${org.bedework.global.ear.name}.ear" /> 11 13 <property name="app.ear.file" 12 location="${dist.home}/${ org.bedework.global.ear.name}.ear" />14 location="${dist.home}/${app.ear.file.name}" /> 13 15 <property name="app.resources.dir" 14 16 location="${this.dir}/../webapp/resources" /> … … 25 27 26 28 <property name="ear.dir" 27 location="${org.bedework.temp.dir}/ ear" />29 location="${org.bedework.temp.dir}/${app.ear.file.name}" /> 28 30 29 31 <property name="properties.dir" … … 88 90 <zip destfile="${app.ear.file}" 89 91 basedir="${ear.dir}"/> 92 93 <!-- Deploy common resources --> 94 <ant antfile="${org.bedework.common.resources}/build.xml" 95 inheritrefs="true" target="deploy" /> 96 97 <!-- copy the ear - at the moment copy the uncompressed. --> 98 99 <if> 100 <isset property="org.bedework.appserver.deploy.dir" /> 101 <then> 102 <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 103 <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 104 <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 105 <fileset dir="${ear.dir}"/> 106 </copy> 107 </then> 108 </if> 90 109 </target> 91 110 trunk/deployment/webadmin/jboss/build.xml
r952 r1807 26 26 <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 27 27 <echo message="***************************************************************" /> 28 <if> 29 <not> 30 <isset property="org.bedework.global.noskins" /> 31 </not> 32 <then> 33 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 34 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 35 <fileset dir="${this.dir}/../webapp/resources" /> 36 </copy> 37 </then> 38 </if> 28 39 </target> 29 40 trunk/deployment/webadmin/webapp/build.xml
r1443 r1807 40 40 41 41 <target name="deploy" depends="init,build.configured" > 42 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 43 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 44 <fileset dir="${app.resources.dir}" /> 45 </copy> 42 <if> 43 <not> 44 <isset property="org.bedework.global.noskins" /> 45 </not> 46 <then> 47 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 48 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 49 <fileset dir="${app.resources.dir}" /> 50 </copy> 51 </then> 52 </if> 46 53 47 54 <!-- Deploy common resources --> trunk/deployment/webconfig/jboss/build.xml
r952 r1807 26 26 <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 27 27 <echo message="***************************************************************" /> 28 <if> 29 <not> 30 <isset property="org.bedework.global.noskins" /> 31 </not> 32 <then> 33 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 34 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 35 <fileset dir="${this.dir}/../webapp/resources" /> 36 </copy> 37 </then> 38 </if> 28 39 </target> 29 40 trunk/deployment/webconfig/webapp/build.xml
r1164 r1807 47 47 48 48 <target name="deploy" depends="init,build.configured" > 49 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 50 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 51 <fileset dir="${app.resources.dir}" /> 52 </copy> 49 <if> 50 <not> 51 <isset property="org.bedework.global.noskins" /> 52 </not> 53 <then> 54 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 55 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 56 <fileset dir="${app.resources.dir}" /> 57 </copy> 58 </then> 59 </if> 53 60 54 61 <echo message="***************************************************************" /> trunk/deployment/webpublic/jboss/build.xml
r952 r1807 26 26 <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 27 27 <echo message="***************************************************************" /> 28 <!-- First copy the resources into the server --> 29 30 <if> 31 <not> 32 <isset property="org.bedework.global.noskins" /> 33 </not> 34 <then> 35 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}" /> 36 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}"> 37 <fileset dir="${this.dir}/../webapp/resources/demoskins/${propval.app.cal.suite}" /> 38 </copy> 39 </then> 40 </if> 28 41 </target> 29 42 trunk/deployment/websubmit/jboss/build.xml
r1580 r1807 26 26 <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 27 27 <echo message="***************************************************************" /> 28 <!-- First copy the resources into the server --> 29 30 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 31 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 32 <fileset dir="${this.dir}/../webapp/resources/demoskins" /> 33 </copy> 28 34 </target> 29 35 trunk/deployment/websubmit/webapp/build.xml
r1580 r1807 46 46 <!-- First copy the resources into the server --> 47 47 48 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 49 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 50 <fileset dir="${app.resources.dir}/demoskins" /> 51 </copy> 48 <if> 49 <not> 50 <isset property="org.bedework.global.noskins" /> 51 </not> 52 <then> 53 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 54 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 55 <fileset dir="${app.resources.dir}/demoskins" /> 56 </copy> 57 </then> 58 </if> 52 59 53 60 <!-- Deploy common resources --> trunk/deployment/webuser/jboss/build.xml
r952 r1807 26 26 <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 27 27 <echo message="***************************************************************" /> 28 29 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 30 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 31 <fileset dir="${this.dir}/../webapp/resources/demoskins" /> 32 </copy> 28 33 </target> 29 34 trunk/deployment/webuser/webapp/build.xml
r1443 r1807 46 46 <!-- First copy the resources into the server --> 47 47 48 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 49 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 50 <fileset dir="${app.resources.dir}/demoskins" /> 51 </copy> 48 <if> 49 <not> 50 <isset property="org.bedework.global.noskins" /> 51 </not> 52 <then> 53 <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 54 <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 55 <fileset dir="${app.resources.dir}/demoskins" /> 56 </copy> 57 </then> 58 </if> 52 59 53 60 <!-- Deploy common resources -->
