Changeset 1938

Show
Ignore:
Timestamp:
10/30/08 15:35:48
Author:
douglm
Message:

Try to do the same for platforms (jboss, tomcat etc) as I just did for portals.

The deployment directories are much simplified and the build process seems a bit clearer.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildwar.xml

    r1937 r1938  
    1919                       application properties, the directory we build in 
    2020                       and the name of war and ear files. 
    21     cal.j2ee           Defined if this is a j2ee application 
    22     cal.j2ee.jboss     Defined if this is a jboss application 
    23     cal.strutsapp      Defined if this is a struts application 
    2421     These should be defined in the build properties for the application. 
    2522 
    …… 
    5047  </if> 
    5148 
    52   <target name="init" depends="init.common,init.j2ee,init.standalone" /> 
     49  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
     50 
     51  <target name="init" depends="init.common"> 
     52    <if> 
     53      <isset property="org.bedework.global.build.ear" /> 
     54      <then> 
     55        <!-- Common library in ear file --> 
     56        <property name="app.dest.lib" 
     57                  location="${org.bedework.ear.templib}" /> 
     58 
     59        <!-- Properties all go into a single jar file at termination --> 
     60        <property name="app.dest.classes" 
     61                  location="${org.bedework.ear.properties.dir}" /> 
     62      </then> 
     63      <else> 
     64        <!-- Library in war file --> 
     65        <property name="app.dest.lib" 
     66                  location="${app.dest.webinf}/lib" /> 
     67 
     68        <!-- Properties in the war file --> 
     69        <property name="app.dest.classes" 
     70                  location="${app.dest.webinf}/classes" /> 
     71      </else> 
     72    </if> 
     73    <property name="app.dest.properties" 
     74              location="${app.dest.classes}/properties/calendar" /> 
     75  </target> 
    5376 
    5477  <target name="init.common"> 
    …… 
    6285    <property name="app.dest.metainf" 
    6386              location="${app.dest.war}/META-INF" /> 
    64     <property name="app.dest.classes" 
    65               location="${app.dest.webinf}/classes" /> 
    66     <property name="app.dest.properties" 
    67               location="${app.dest.classes}/properties/calendar" /> 
    6887 
    6988    <!--temp web.xml location  --> 
    …… 
    94113  </target> 
    95114 
    96   <target name="init.standalone" if="org.bedework.global.build.standalone.app"> 
    97  
    98     <property name="app.dest.lib" 
    99               location="${app.dest.webinf}/lib" /> 
    100   </target> 
    101  
    102   <target name="init.j2ee" if="org.bedework.global.j2ee.platform"> 
    103     <property name="app.dest.lib" 
    104               location="${org.bedework.temp.dir}/earlib" /> 
    105   </target> 
    106  
    107115  <target name="build" depends="init"> 
    108116    <echo message="**************************************************" /> 
    …… 
    131139         =============================================================== --> 
    132140 
    133     <available file="${app.sou.dir}/properties" type="dir" 
    134                property="org.bedework.properties.dir.exists" /> 
    135  
    136     <available file="${app.sou.properties}" type="file" 
    137                property="org.bedework.servlet.properties.exists" /> 
    138  
    139     <available file="${app.sou.dir}/war/docs" type="dir" 
    140                property="org.bedework.war.docs.exists" /> 
    141  
    142     <antcall target="copy.properties" inheritRefs="true" /> 
    143     <antcall target="copy.servlet.properties" inheritRefs="true" /> 
    144     <antcall target="copy.war.docs" inheritRefs="true" /> 
     141    <if> 
     142      <available file="${app.sou.dir}/war/docs" type="dir" /> 
     143      <then> 
     144        <copy todir="${app.dest.docs}"> 
     145          <fileset dir="${app.sou.dir}/war/docs" /> 
     146        </copy> 
     147      </then> 
     148    </if> 
     149 
     150    <!-- =============================================================== 
     151         Any property files we need for configuration, other than the 
     152         standard struts file, should be in the "${app.sou.dir}/properties 
     153         directory. They will be copied into the appropriate place for the 
     154         war and transformed by the above filter. 
     155         =============================================================== --> 
     156    <if> 
     157      <available file="${app.sou.dir}/properties" type="dir" /> 
     158      <then> 
     159        <copy todir="${app.dest.properties}" overwrite="yes" > 
     160          <fileset dir="${app.sou.dir}/properties" 
     161                   includes="*.properties"/> 
     162          <filterset refid="property.filters" /> 
     163        </copy> 
     164      </then> 
     165    </if> 
     166 
     167    <copy todir="${app.dest.classes}"> 
     168      <fileset dir="${app.sou.dir}/war/WEB-INF/classes" 
     169               includes="*"/> 
     170      <filterset refid="property.filters" /> 
     171    </copy> 
    145172 
    146173    <!-- Create the runtime options file --> 
    …… 
    152179        <filter token="RPI-DEBUG" value="${app.debug.val}"/> 
    153180      </filterset> 
     181      <filterset refid="property.filters" /> 
     182    </copy> 
     183 
     184    <copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}"> 
     185      <filterset refid="property.filters" /> 
     186    </copy> 
     187 
     188    <!-- =============================================================== 
     189         Add hibernate jars and property files from calendar api. 
     190         =============================================================== --> 
     191 
     192    <copy todir="${app.dest.classes}"> 
     193      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
     194      <filterset refid="property.filters" /> 
     195    </copy> 
     196 
     197    <copy todir="${app.dest.classes}"> 
     198      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
    154199      <filterset refid="property.filters" /> 
    155200    </copy> 
    …… 
    177222${propval.app.war.name}.context=${propval.app.context.root} 
    178223    </echo> 
    179  
    180     <!-- =============================================================== 
    181          Add hibernate jars and property files from calendar api. 
    182          =============================================================== --> 
    183  
    184     <copy todir="${app.dest.classes}"> 
    185       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
    186       <filterset refid="property.filters" /> 
    187     </copy> 
    188  
    189     <copy todir="${app.dest.classes}"> 
    190       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
    191       <filterset refid="property.filters" /> 
    192     </copy> 
    193224 
    194225    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
    …… 
    202233    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    203234 
    204     <antcall target="jboss-stuff" inheritRefs="true" /> 
    205235    <antcall target="bexchange-stuff" inheritRefs="true" /> 
    206236    <antcall target="domino-stuff" inheritRefs="true" /> 
    …… 
    229259    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
    230260 
    231      <!-- any extra files--> 
    232     <copy todir="${app.dest.lib}" > 
    233       <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    234     </copy> 
    235  
    236     <!-- Some more standard libs --> 
    237     <if> 
    238       <not> 
    239         <isset property="org.bedework.build.for.jboss"/> 
    240       </not> 
    241       <then> 
    242         <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
    243       </then> 
    244     </if> 
    245261    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
    246262    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
    …… 
    260276    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
    261277 
    262     <!-- add the jdbcdriver if defined 
    263          Disable this - shouldn't be adding jdbc drivers to the war file 
    264     <if> 
    265       <isset property="app.jdbcdriver.jar"/> 
    266       <then> 
    267         <copy todir="${app.dest.lib}" file="${app.jdbcdriver.jar}"/> 
    268       </then> 
    269     </if> 
    270      --> 
    271  
    272     <!-- tomcat --> 
    273     <antcall target="add.tomcat" inheritRefs="true" /> 
     278    <!-- any extra files--> 
     279    <copy todir="${app.dest.lib}" > 
     280      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     281    </copy> 
     282 
     283    <!-- Platform specific --> 
     284    <antcall target="doPlatform" inheritRefs="true" /> 
    274285 
    275286    <!-- build the war file --> 
    …… 
    281292         basedir="${app.dest.war}" 
    282293         excludes="WEB-INF/web.xml" /> 
    283   </target> 
    284  
    285   <target name="add.tomcat" if="org.bedework.global.deploy.on.tomcat"> 
    286     <property name="propval.app.tomcat.context.xml" 
    287               location="${app.sou.dir}/war/META-INF/context.xml" /> 
    288     <resolveFile name="app.tomcat.context.xml" 
    289                  file="${propval.app.tomcat.context.xml}" 
    290                  base="${app.sou.dir}"/> 
    291  
    292     <copy tofile="${app.dest.metainf}/context.xml" 
    293           file="${app.tomcat.context.xml}" 
    294           overwrite="yes" > 
    295       <filterset refid="property.filters" /> 
    296     </copy> 
    297   </target> 
    298  
    299   <target name="copy.properties" if="org.bedework.properties.dir.exists"> 
    300     <!-- =============================================================== 
    301          Any property files we need for configuration, other than the 
    302          standard struts file, should be in the "${app.sou.dir}/properties 
    303          directory. They will be copied into the appropriate place for the 
    304          war and transformed by the above filter. 
    305          =============================================================== --> 
    306     <copy todir="${app.dest.properties}" overwrite="yes" > 
    307       <fileset dir="${app.sou.dir}/properties" 
    308                includes="*.properties"/> 
    309       <filterset refid="property.filters" /> 
    310     </copy> 
    311   </target> 
    312  
    313   <target name="copy.servlet.properties"> 
    314     <copy todir="${app.dest.classes}"> 
    315       <fileset dir="${app.sou.dir}/war/WEB-INF/classes" 
    316                includes="*"/> 
    317       <filterset refid="property.filters" /> 
    318     </copy> 
    319   </target> 
    320  
    321   <target name="copy.war.docs" if="org.bedework.war.docs.exists"> 
    322     <copy todir="${app.dest.docs}"> 
    323       <fileset dir="${app.sou.dir}/war/docs" /> 
    324     </copy> 
    325294  </target> 
    326295 
    …… 
    366335      </fileset> 
    367336    </copy> 
    368  
    369     <if> 
    370       <not> 
    371         <isset property="xalan.in.tomcat.common.endorsed" /> 
    372       </not> 
    373       <then> 
    374         <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
    375       </then> 
    376     </if> 
    377337 
    378338    <if> 
    …… 
    383343    </if> 
    384344 
     345    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
    385346    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
    386347 
    …… 
    395356    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
    396357  </target> 
    397  
    398   <!-- ================================================================= 
    399        If this is a j2ee app the following gets executed. 
    400        We create an uodated jboss-web.xml file (for jboss) and a ear 
    401        ================================================================= --> 
    402  
    403   <target name="jboss-stuff" if="org.bedework.build.for.jboss"> 
    404     <copy todir="${app.dest.webinf}" 
    405           file="${app.sou.dir}/war/WEB-INF/jboss-web.xml"> 
    406       <filterset refid="property.filters" /> 
    407     </copy> 
    408  
    409     <if> 
    410       <isset property="propval.app.virtual.host" /> 
    411       <then> 
    412         <replace file="${app.dest.webinf}/jboss-web.xml"> 
    413           <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken> 
    414           <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host> 
    415           ]]> 
    416           </replacevalue> 
    417         </replace> 
    418         <replace file="${app.dest.webinf}/jboss-web.xml"> 
    419           <replacefilter token="@VIRTUAL-HOST@" value="${propval.app.virtual.host}"/> 
    420         </replace> 
    421       </then> 
    422     </if> 
    423   </target> 
    424  
    425   <target name="build.ear" if="cal.j2ee"> 
    426     <ant antfile="${buildear}" 
    427          inheritRefs="true" target="build" /> 
    428   </target> 
    429358</project> 

  • trunk/build/loadDeployConfig.xml

    r1937 r1938  
    3939 
    4040          <property name="org.bedework.config.portal.home" 
    41                     value="${org.bedework.config.home}/.portal/${org.bedework.global.portal.platform}" /> 
     41                    value="${org.bedework.configurations.home}/.portal/${org.bedework.global.portal.platform}" /> 
    4242 
    4343          <property name="org.bedework.config.portal.common.home" 
    44                     value="${org.bedework.config.home}/.portal/common-resources" /> 
     44                    value="${org.bedework.configurations.home}/.portal/common-resources" /> 
    4545 
    4646          <echo message="******************* load from ${org.bedework.config.portal.home}/portal.properties" /> 
    …… 
    4848        </then> 
    4949        <else> 
    50           <echo message="******************* load from ${org.bedework.config.home}/.standalone/standalone.properties" /> 
    51           <property file="${org.bedework.config.home}/.standalone/standalone.properties" /> 
     50          <echo message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" /> 
     51          <property file="${org.bedework.configurations.home}/.platform/standalone.properties" /> 
    5252        </else> 
     53      </if> 
     54 
     55      <if> 
     56        <isset property="org.bedework.global.build.ear"/> 
     57        <then> 
     58          <property file="${org.bedework.configurations.home}/.platform/ear.properties" /> 
     59        </then> 
    5360      </if> 
    5461 

  • trunk/build/portals/jetspeed2War.xml

    r1937 r1938  
    5454 
    5555    <copy tofile="${app.dest.webinf}/portlet.psml" 
    56           file="${org.bedework.deploy.type.dir}/portlet/jetspeed2-portlet.psml" 
     56          file="${org.bedework.config.portal.common.home}/jetspeed2-portlet.psml" 
    5757          overwrite="yes" 
    5858          failonerror="no" > 
    …… 
    6565      </not> 
    6666      <then> 
    67         <replace file="${app.dest.webinf}/struts-config.xml"> 
     67        <replace file="${app.dest.webinf}/portlet.psml"> 
    6868          <replacetoken><![CDATA[<!-- Security constraints go here -->]]></replacetoken> 
    6969          <replacevalue><![CDATA[<security-constraints> 

  • trunk/config/bwbuild/.platform

    • Property svn:mergeinfo set

  • trunk/config/bwbuild/.platform/standalone.properties

    r1937 r1938  
    44# Properties for a standalone (and j2ee) build. These will be used for additional 
    55# configuration of the war files 
     6# 
     7# Generally this file will not need to be changed. 
    68# 
    79# -------------------------------------------------------------------- 

  • trunk/config/bwbuild/default/build.properties

    r1937 r1938  
    1111# 
    1212# On entry 
    13 #       env.BEDEWORK_CONFIGS is set to the directory containing all the confurations 
     13#       env.BEDEWORK_CONFIGS is set to the directory containing all the configurations 
    1414#       env.BEDEWORK_CONFIG is set to the directory containing the config files 
    1515# 
    …… 
    1717compile.debug=yes 
    1818 
    19 org.bedework.config.home=${env.BEDEWORK_CONFIGS_HOME} 
     19org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME} 
    2020org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties 
    2121org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml 

  • trunk/config/bwbuild/default/cal.properties

    r1937 r1938  
    2727org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    2828 
    29 # Parameters for standalone 
     29# Parameters for shell apps 
    3030org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver 
    3131org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:8887 
    …… 
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Comment this out for j2ee deploy 
    40 org.bedework.global.build.standalone.app=true 
    41  
    42 # Comment this out if deploying on some other app server 
    43 org.bedework.global.deploy.on.tomcat=true 
     39# Specify the platform we are building for. buildwar.xml will import the file 
     40# build/platforms/<platform>War.xml 
     41org.bedework.global.deploy.platform=tomcat5 
    4442 
    4543# uris to cross link apps - of dubious usefulness 
    …… 
    4745org.bedework.global.public.calendar.uri=/cal 
    4846org.bedework.global.personal.calendar.uri=/ucal 
    49  
    50 # This is where we copy common xsl and javascript for inclusion by xsl and generated 
    51 # content. 
    52 org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
    53  
    54 # enable this and standalone for jboss 
    55 #org.bedework.build.for.jboss=yes 
    56  
    5747# 
    5848# ------------------------------------------------------------------------ 
    …… 
    112102# ------------------------------------------------------------------------ 
    113103# 
     104# ------------------------------------------------------------------------ 
     105#   Common context for javasscript, resources etc. 
     106# ------------------------------------------------------------------------ 
     107# Enable building of a common context for common javascript. 
     108# This context will be deployed along with the applications and makes common 
     109# javascript available under, two paths at the contex defined here. 
     110# 
     111# This is necessary to deal with problems delivering commmon code from the same 
     112# server when the root context is defined to be an application rather than the 
     113# normal web server default. 
     114# 
     115org.bedework.global.build.common.context.name=bedework-common 
     116org.bedework.global.build.common.context.root=/bedework-common 
     117org.bedework.global.build.common.context.war.name=bedework-common 
     118org.bedework.global.build.common.context.deploy.dir=/webapps 
     119 
     120# This is where we copy common xsl and javascript for inclusion by xsl and generated 
     121# content. 
     122#org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
     123 
    114124# 
    115125# ------------------------------------------------------------------- 
    …… 
    142152 
    143153org.bedework.app.CalAdmin.war.name=caladmin 
    144 org.bedework.app.CalAdmin.ear.name=caladmin 
    145154org.bedework.app.CalAdmin.context.root=/caladmin 
    146155# Set for jboss 
    …… 
    170179 
    171180org.bedework.app.EventSubmit.war.name=eventsubmit 
    172 org.bedework.app.EventSubmit.ear.name=eventsubmit 
    173181org.bedework.app.EventSubmit.context.root=/eventsubmit 
    174182# Set for jboss 
    …… 
    198206 
    199207org.bedework.app.Events.war.name=cal 
    200 org.bedework.app.Events.ear.name=cal 
    201208org.bedework.app.Events.context.root=/cal 
    202209# Set for jboss 
    …… 
    223230 
    224231org.bedework.app.SoEDept.war.name=soedept 
    225 org.bedework.app.SoEDept.ear.name=soedept 
    226232org.bedework.app.SoEDept.context.root=/soedept 
    227233# Set for jboss 
    …… 
    248254 
    249255org.bedework.app.UserCal.war.name=ucal 
    250 org.bedework.app.UserCal.ear.name=ucal 
    251256org.bedework.app.UserCal.context.root=/ucal 
    252257# Set for jboss 
    …… 
    275280org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml 
    276281org.bedework.app.Pubcaldav.war.name=pubcaldav 
    277 org.bedework.app.Pubcaldav.ear.name=pubcaldav 
    278282org.bedework.app.Pubcaldav.context.root=/pubcaldav 
    279283# Set for jboss 
    …… 
    298302org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml 
    299303org.bedework.app.Usercaldav.war.name=ucaldav 
    300 org.bedework.app.Usercaldav.ear.name=ucaldav 
    301304org.bedework.app.Usercaldav.context.root=/ucaldav 
    302305# Set for jboss 

  • trunk/config/bwbuild/jboss/democal.properties

    r1937 r1938  
    2727org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    2828 
    29 # Parameters for standalone 
     29# Parameters for shell apps 
    3030org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver 
    3131org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:1701 
    …… 
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Comment this out for j2ee deploy 
    40 #org.bedework.global.build.standalone.app=true 
    41  
    42 # Comment this out if deploying on some other app server 
    43 #org.bedework.global.deploy.on.tomcat=true 
    44  
    45 org.bedework.global.j2ee.platform=jboss 
     39# Specify the platform we are building for. buildwar.xml will import the file 
     40# build/platforms/<platform>War.xml 
     41org.bedework.global.deploy.platform=tomcat5 
     42 
     43org.bedework.global.build.ear=yes 
    4644org.bedework.global.ear.name=rpical 
     45 
     46# This allows us to exclude some libraries when copying files into the ear file. 
     47# Version we use in bedework may conflict with versions installed in the application 
     48# server. 
     49org.bedework.global.ear.lib.excludes=commons-logging*,log4j*,jgroup*,servlet.jsp* 
    4750 
    4851# uris to cross link apps - of dubious usefulness 
    …… 
    5053org.bedework.global.public.calendar.uri=/cal 
    5154org.bedework.global.personal.calendar.uri=/ucal 
    52  
    53 # enable this and standalone for jboss 
    54 org.bedework.build.for.jboss=yes 
    5555 
    5656# 
    …… 
    154154 
    155155org.bedework.app.CalAdmin.war.name=caladmin 
    156 org.bedework.app.CalAdmin.ear.name=caladmin 
    157156org.bedework.app.CalAdmin.context.root=/caladmin 
    158157# Set for jboss 
    …… 
    183182 
    184183org.bedework.app.EventSubmit.war.name=eventsubmit 
    185 org.bedework.app.EventSubmit.ear.name=eventsubmit 
    186184org.bedework.app.EventSubmit.context.root=/eventsubmit 
    187185# Set for jboss 
    …… 
    212210 
    213211org.bedework.app.Events.war.name=cal 
    214 org.bedework.app.Events.ear.name=cal 
    215212org.bedework.app.Events.context.root=/cal 
    216213# Set for jboss 
    …… 
    238235 
    239236org.bedework.app.SoEDept.war.name=soedept 
    240 org.bedework.app.SoEDept.ear.name=soedept 
    241237org.bedework.app.SoEDept.context.root=/soedept 
    242238# Set for jboss 
    …… 
    264260 
    265261org.bedework.app.UserCal.war.name=ucal 
    266 org.bedework.app.UserCal.ear.name=ucal 
    267262org.bedework.app.UserCal.context.root=/ucal 
    268263# Set for jboss 
    …… 
    292287org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml 
    293288org.bedework.app.Pubcaldav.war.name=pubcaldav 
    294 org.bedework.app.Pubcaldav.ear.name=pubcaldav 
    295289org.bedework.app.Pubcaldav.context.root=/pubcaldav 
    296290# Set for jboss 
    …… 
    316310org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml 
    317311org.bedework.app.Usercaldav.war.name=ucaldav 
    318 org.bedework.app.Usercaldav.ear.name=ucaldav 
    319312org.bedework.app.Usercaldav.context.root=/ucaldav 
    320313# Set for jboss 

  • trunk/config/bwbuild/liferay5/cal.properties

    r1937 r1938  
    2727org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    2828 
    29 # Parameters for standalone 
     29# Parameters for shell apps 
    3030org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver 
    3131org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:8887 
    …… 
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Comment this out for j2ee deploy 
    40 org.bedework.global.build.standalone.app=true 
    41  
    42 # Comment this out if deploying on some other app server 
    43 org.bedework.global.deploy.on.tomcat=true 
     39# Specify the platform we are building for. buildwar.xml will import the file 
     40# build/platforms/<platform>War.xml 
     41org.bedework.global.deploy.platform=tomcat5 
    4442 
    4543# uris to cross link apps - of dubious usefulness 
    …… 
    4745org.bedework.global.public.calendar.uri=/cal 
    4846org.bedework.global.personal.calendar.uri=/ucal 
    49  
    50 # This is where we copy common xsl and javascript for inclusion by xsl and generated 
    51 # content. 
    52 org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
    53  
    54 # enable this and standalone for jboss 
    55 #org.bedework.build.for.jboss=yes 
    5647 
    5748# 
    …… 
    144135 
    145136org.bedework.app.CalAdmin.war.name=caladmin 
    146 org.bedework.app.CalAdmin.ear.name=caladmin 
    147137org.bedework.app.CalAdmin.context.root=/caladmin 
    148138# Set for jboss 
    …… 
    173163 
    174164org.bedework.app.EventSubmit.war.name=eventsubmit 
    175 org.bedework.app.EventSubmit.ear.name=eventsubmit 
    176165org.bedework.app.EventSubmit.context.root=/eventsubmit 
    177166# Set for jboss 
    …… 
    202191 
    203192org.bedework.app.Events.war.name=cal 
    204 org.bedework.app.Events.ear.name=cal 
    205193org.bedework.app.Events.context.root=/cal 
    206194# Set for jboss 
    …… 
    228216 
    229217org.bedework.app.SoEDept.war.name=soedept 
    230 org.bedework.app.SoEDept.ear.name=soedept 
    231218org.bedework.app.SoEDept.context.root=/soedept 
    232219# Set for jboss 
    …… 
    254241 
    255242org.bedework.app.UserCal.war.name=ucal 
    256 org.bedework.app.UserCal.ear.name=ucal 
    257243org.bedework.app.UserCal.context.root=/ucal 
    258244# Set for jboss 
    …… 
    282268org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml 
    283269org.bedework.app.Pubcaldav.war.name=pubcaldav 
    284 org.bedework.app.Pubcaldav.ear.name=pubcaldav 
    285270org.bedework.app.Pubcaldav.context.root=/pubcaldav 
    286271# Set for jboss 
    …… 
    306291org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml 
    307292org.bedework.app.Usercaldav.war.name=ucaldav 
    308 org.bedework.app.Usercaldav.ear.name=ucaldav 
    309293org.bedework.app.Usercaldav.context.root=/ucaldav 
    310294# Set for jboss 

  • trunk/config/configs/democal.properties

    r1937 r1938  
    2727org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    2828 
    29 # Parameters for standalone 
     29# Parameters for shell apps 
    3030org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver 
    3131org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:8887 
    …… 
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Comment this out for j2ee deploy 
    40 org.bedework.global.build.standalone.app=true 
    41  
    42 # Comment this out if deploying on some other app server 
    43 org.bedework.global.deploy.on.tomcat=true 
     39# Specify the platform we are building for. buildwar.xml will import the file 
     40# build/platforms/<platform>War.xml 
     41org.bedework.global.deploy.platform=tomcat5 
    4442 
    4543# uris to cross link apps - of dubious usefulness 
    …… 
    4846org.bedework.global.personal.calendar.uri=/ucal 
    4947 
    50 # This is where we copy common xsl and javascript for inclusion by xsl and generated 
    51 # content. 
    52 org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
    53  
    54 # enable this and standalone for jboss 
    55 #org.bedework.build.for.jboss=yes 
    5648# 
    5749# ------------------------------------------------------------------------ 
    …… 
    142134 
    143135org.bedework.app.CalAdmin.war.name=caladmin 
    144 org.bedework.app.CalAdmin.ear.name=caladmin 
    145136org.bedework.app.CalAdmin.context.root=/caladmin 
    146137# Set for jboss 
    …… 
    171162 
    172163org.bedework.app.EventSubmit.war.name=eventsubmit 
    173 org.bedework.app.EventSubmit.ear.name=eventsubmit 
    174164org.bedework.app.EventSubmit.context.root=/eventsubmit 
    175165# Set for jboss 
    …… 
    200190 
    201191org.bedework.app.Events.war.name=cal 
    202 org.bedework.app.Events.ear.name=cal 
    203192org.bedework.app.Events.context.root=/cal 
    204193# Set for jboss 
    …… 
    226215 
    227216org.bedework.app.SoEDept.war.name=soedept 
    228 org.bedework.app.SoEDept.ear.name=soedept 
    229217org.bedework.app.SoEDept.context.root=/soedept 
    230218# Set for jboss 
    …… 
    252240 
    253241org.bedework.app.UserCal.war.name=ucal 
    254 org.bedework.app.UserCal.ear.name=ucal 
    255242org.bedework.app.UserCal.context.root=/ucal 
    256243# Set for jboss 
    …… 
    280267org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml 
    281268org.bedework.app.Pubcaldav.war.name=pubcaldav 
    282 org.bedework.app.Pubcaldav.ear.name=pubcaldav 
    283269org.bedework.app.Pubcaldav.context.root=/pubcaldav 
    284270# Set for jboss 
    …… 
    304290org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml 
    305291org.bedework.app.Usercaldav.war.name=ucaldav 
    306 org.bedework.app.Usercaldav.ear.name=ucaldav 
    307292org.bedework.app.Usercaldav.context.root=/ucaldav 
    308293# Set for jboss 

  • trunk/config/configs/metadata.xml

    r1692 r1938  
    6565             suffix="directory.browsing.disallowed" 
    6666             option="directoryBrowsingDisallowed" advanced="true"> 
    67       <default>true</default> 
    68     </boolean> 
    69  
    70     <boolean name="buildStandaloneApp" suffix="build.standalone.app"> 
    7167      <default>true</default> 
    7268    </boolean> 

  • trunk/deployment/build.xml

    r1937 r1938  
    102102    <delete dir="${org.bedework.temp.wars.home}" /> 
    103103 
    104     <antcall target="build.standalone.apps" inheritrefs="true" /> 
    105  
    106     <antcall target="build.j2ee.apps" inheritrefs="true" /> 
     104    <antcall target="build.apps" inheritrefs="true" /> 
    107105  </target> 
    108106 
    …… 
    113111       ================================================================= --> 
    114112 
    115   <target name="build.standalone.apps" if="org.bedework.global.build.standalone.app" > 
     113  <target name="build.apps" > 
    116114    <property name="org.bedework.deploy.kind" value="webapp" /> 
    117     <antcall target="build.configured.apps" inheritrefs="true" /> 
    118   </target> 
    119  
    120   <target name="build.j2ee.apps" if="org.bedework.global.j2ee.platform" > 
    121     <property name="org.bedework.deploy.kind" 
    122               value="${org.bedework.global.j2ee.platform}" /> 
    123115    <antcall target="build.configured.apps" inheritrefs="true" /> 
    124116  </target> 
    …… 
    148140                 check="true" /> 
    149141 
    150     <if> 
    151       <isset property="org.bedework.global.build.standalone.app" /> 
    152       <then> 
    153         <antcall target="deploy.apps" inheritrefs="true" > 
    154           <param name="org.bedework.deploy.kind" value="webapp" /> 
    155         </antcall> 
    156       </then> 
    157     </if> 
    158  
    159     <!-- Always build the shellscr stuff.--> 
     142    <!-- Build the webapps stuff.--> 
     143    <antcall target="deploy.apps" inheritrefs="true" > 
     144      <param name="org.bedework.deploy.kind" value="webapp" /> 
     145    </antcall> 
     146 
     147    <!-- Build the shellscr stuff.--> 
    160148    <antcall target="deploy.apps" inheritrefs="true" > 
    161149      <param name="org.bedework.deploy.kind" value="shellscr" /> 
    162150    </antcall> 
    163  
    164     <if> 
    165       <isset property="org.bedework.global.j2ee.platform" /> 
    166       <then> 
    167         <antcall target="deploy.apps" inheritrefs="true" > 
    168           <param name="org.bedework.deploy.kind" 
    169                  value="${org.bedework.global.j2ee.platform}" /> 
    170         </antcall> 
    171       </then> 
    172     </if> 
    173151 
    174152    <!-- copy startup website that sends you to the applications --> 

  • trunk/deployment/deployprops.xml

    r1105 r1938  
    77  <property name="propval.app.cal.suite" value="" /> 
    88 
    9   <condition property="org.bedework.build.for.jboss"> 
    10     <equals arg1="jboss" arg2="${org.bedework.global.j2ee.platform}"/> 
    11   </condition> 
    12  
    139  <target name="deployprops.init" > 
    1410  </target> 

  • trunk/deployment/freebusyAggregator/webapp/build.xml

    r1936 r1938  
    5050    </copy> 
    5151 
    52     <echo message="***************************************************************" /> 
    53     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    54     <echo message="***************************************************************" /> 
     52    <if> 
     53      <not> 
     54        <isset property="org.bedework.global.build.ear" /> 
     55      </not> 
     56      <then> 
     57        <echo message="***************************************************************" /> 
     58        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     59        <echo message="***************************************************************" /> 
    5560 
    56     <!-- copy the war file. --> 
    57     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    58           overwrite="yes" /> 
     61        <!-- copy the war file. --> 
     62        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     63              overwrite="yes" /> 
    5964 
    60     <!-- Delete expanded version --> 
    61     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     65        <!-- Delete expanded version --> 
     66        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    6267 
    63     <!-- Delete the quickstart context def --> 
    64     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    65  
    66     <antcall target="deploy.for.portal" inheritRefs="true" /> 
    67   </target> 
    68  
    69   <target name="deploy.for.portal" if="org.bedework.global.portal.platform" > 
    70     <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    71          inheritrefs="true" target="deploy" /> 
     68        <!-- Delete the quickstart context def --> 
     69        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     70      </then> 
     71    </if> 
    7272  </target> 
    7373 

  • trunk/deployment/publiccaldav/webapp/build.xml

    r1895 r1938  
    3838 
    3939  <target name="deploy" depends="init,build.configured" > 
    40     <echo message="***************************************************************" /> 
    41     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    42     <echo message="***************************************************************" /> 
     40    <if> 
     41      <not> 
     42        <isset property="org.bedework.global.build.ear" /> 
     43      </not> 
     44      <then> 
     45        <echo message="***************************************************************" /> 
     46        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     47        <echo message="***************************************************************" /> 
    4348 
    44     <!-- copy the war file. --> 
    45     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    46           overwrite="yes" /> 
     49        <!-- copy the war file. --> 
     50        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     51              overwrite="yes" /> 
    4752 
    48     <!-- Delete expanded version --> 
    49     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     53        <!-- Delete expanded version --> 
     54        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    5055 
    51     <!-- Delete the quickstart context def --> 
    52     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     56        <!-- Delete the quickstart context def --> 
     57        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     58      </then> 
     59    </if> 
    5360  </target> 
    5461 

  • trunk/deployment/resources/build.xml

    r1937 r1938  
    4040 
    4141  <target name="deploy" depends="init" > 
     42    <!-- 
    4243    <if> 
    4344      <isset property="org.bedework.global.build.common.context" /> 
    4445      <then> 
     46       --> 
    4547        <!-- Build a deployable war file with common files --> 
    4648 
    …… 
    5759            <!-- Add dojo --> 
    5860            <copy todir="${common.dest.war}/javascript/dojo"> 
    59               <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 
     61              <fileset dir="${common.resources.dir}/javascript/${org.bedework.dojo.dir}" /> 
    6062            </copy> 
    6163          </then> 
    …… 
    7981             excludes="WEB-INF/web.xml" /> 
    8082 
    81         <echo message="***************************************************************" /> 
    82         <echo message="Deploying common context ${common.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    83         <echo message="***************************************************************" /> 
     83        <if> 
     84          <not> 
     85            <isset property="org.bedework.global.build.ear" /> 
     86          </not> 
     87          <then> 
     88            <echo message="***************************************************************" /> 
     89            <echo message="Deploying common context ${common.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     90            <echo message="***************************************************************" /> 
    8491 
    85         <!-- Delete expanded version --> 
    86         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     92            <!-- Delete expanded version --> 
     93            <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    8794 
    88         <!-- copy the war file. --> 
    89         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
    90               file="${common.war.file}" 
    91               overwrite="yes" /> 
     95            <!-- copy the war file. --> 
     96            <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
     97                  file="${common.war.file}" 
     98                  overwrite="yes" /> 
    9299 
    93         <!-- Delete the quickstart context def --> 
    94         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    95  
    96         <!-- 
    97         <if> 
    98           <isset property="org.bedework.global.portal.platform" /> 
    99           <then> 
    100             <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    101                  inheritrefs="true" target="deploy" /> 
     100            <!-- Delete the quickstart context def --> 
     101            <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    102102          </then> 
    103103        </if> 
    104         --> 
     104<!-- 
    105105      </then> 
    106106      <else> 
    …… 
    110110          </not> 
    111111          <then> 
    112             <!-- Just copy into a common location --> 
     112            < ! - - Just copy into a common location  - - > 
    113113            <property name="cmn.destdir" 
    114114                      location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/> 
    …… 
    116116              <isset property="org.bedework.use.dojo" /> 
    117117              <then> 
    118                 <!-- Add dojo --> 
     118                < ! - - Add dojo - - > 
    119119                <copy todir="${cmn.destdir}/javascript/dojo"> 
    120120                  <fileset dir="${common.resources.dir}/javascript/${org.bedework.dojo.dir}" /> 
    …… 
    135135      </else> 
    136136    </if> 
     137       --> 
    137138  </target> 
    138139</project> 

  • trunk/deployment/resources/common-context/WEB-INF/web.xml

    r1191 r1938  
    1414      <url-pattern>/*</url-pattern> 
    1515    </web-resource-collection> 
    16     <auth-constraint> 
    17       <role-name>*</role-name> 
    18     </auth-constraint> 
    19     <user-data-constraint> 
    20       <description>open - http</description> 
    21       <transport-guarantee>NONE</transport-guarantee> 
    22     </user-data-constraint> 
    2316  </security-constraint> 
    2417</web-app> 

  • trunk/deployment/termination/webapp/build.xml

    r1193 r1938  
    99 
    1010  <target name="init"> 
     11    <dirname property="this.dir" file="${ant.file}"/> 
     12 
     13    <property name="app.ear.file.name" 
     14              value="${org.bedework.global.ear.name}.ear" /> 
     15    <property name="app.ear.file" 
     16              location="${dist.home}/${app.ear.file.name}" /> 
    1117  </target> 
    1218 
    …… 
    1521    <ant antfile="${org.bedework.common.resources}/build.xml" 
    1622         inheritrefs="true" target="deploy" /> 
     23 
     24    <if> 
     25      <isset property="org.bedework.global.build.ear" /> 
     26      <then> 
     27        <echo message="***************************************************************" /> 
     28        <echo message="Building ear file for jboss deployment" /> 
     29        <echo message="***************************************************************" /> 
     30 
     31        <jar jarfile="${org.bedework.ear.properties.jar}"> 
     32          <fileset dir="${org.bedework.ear.properties.dir}"/> 
     33        </jar> 
     34 
     35        <path id="app.xml.cp"> 
     36          <pathelement location="${org.bedework.deployutil.jar}"/> 
     37        </path> 
     38 
     39        <taskdef name="applicationXml" 
     40                 classname="org.bedework.deployment.ApplicationXmlTask"> 
     41          <classpath refid="app.xml.cp"/> 
     42        </taskdef> 
     43 
     44        <!-- We have to drop some of the libraries so they don't conflict --> 
     45        <copy toDir="${ear.dir}"> 
     46          <fileset dir="${org.bedework.temp.dir}/earlib" 
     47                   excludes="${org.bedework.global.ear.lib.excludes}" /> 
     48        </copy> 
     49 
     50        <applicationXml displayName="Bedework calendar suite" 
     51                        outFile="${ear.dir}/META-INF/application.xml" 
     52                        warDir="${org.bedework.temp.dir}/wars" 
     53                        contexts="${org.bedework.global.context.roots}"> 
     54          <fileset dir="${ear.dir}"> 
     55            <include name="*.jar"/> 
     56          </fileset> 
     57        </applicationXml> 
     58 
     59        <manifest file="${ear.dir}/META-INF/MANIFEST.MF" /> 
     60 
     61        <copy toDir="${ear.dir}"> 
     62          <fileset dir="${org.bedework.temp.wars.home}"/> 
     63        </copy> 
     64 
     65        <zip destfile="${app.ear.file}" 
     66             basedir="${ear.dir}"/> 
     67 
     68        <!-- copy the ear - at the moment copy the uncompressed. --> 
     69 
     70        <if> 
     71          <isset property="org.bedework.appserver.deploy.dir" /> 
     72          <then> 
     73            <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     74            <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     75            <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 
     76              <fileset dir="${ear.dir}"/> 
     77            </copy> 
     78          </then> 
     79        </if> 
     80      </then> 
     81    </if> 
    1782  </target> 
    1883 

  • trunk/deployment/usercaldav/webapp/build.xml

    r1895 r1938  
    3737 
    3838  <target name="deploy" depends="init,build.configured" > 
    39     <echo message="***************************************************************" /> 
    40     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    41     <echo message="***************************************************************" /> 
     39    <if> 
     40      <not> 
     41        <isset property="org.bedework.global.build.ear" /> 
     42      </not> 
     43      <then> 
     44        <echo message="***************************************************************" /> 
     45        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     46        <echo message="***************************************************************" /> 
    4247 
    43     <!-- copy the war file. --> 
    44     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    45           overwrite="yes" /> 
     48        <!-- copy the war file. --> 
     49        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     50              overwrite="yes" /> 
    4651 
    47     <!-- Delete expanded version --> 
    48     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     52        <!-- Delete expanded version --> 
     53        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    4954 
    50     <!-- Delete the quickstart context def --> 
    51     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     55        <!-- Delete the quickstart context def --> 
     56        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     57      </then> 
     58    </if> 
    5259  </target> 
    5360 

  • trunk/deployment/webadmin/webapp/build.xml

    r1937 r1938  
    6666    </if> 
    6767 
    68     <!-- Deploy common resources --> 
    69     <!-- 
    70     <ant antfile="${org.bedework.common.resources}/build.xml" 
    71          inheritrefs="true" target="deploy" > 
    72       <property name="app.common.resources.dest.dir" 
    73                 location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
    74     </ant> 
    75     --> 
     68    <if> 
     69      <not> 
     70        <isset property="org.bedework.global.build.ear" /> 
     71      </not> 
     72      <then> 
     73        <echo message="***************************************************************" /> 
     74        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     75        <echo message="***************************************************************" /> 
    7676 
    77     <echo message="***************************************************************" /> 
    78     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    79     <echo message="***************************************************************" /> 
     77        <!-- copy the war file. --> 
     78        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     79              overwrite="yes" /> 
    8080 
    81     <!-- copy the war file. --> 
    82     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    83           overwrite="yes" /> 
     81        <!-- Delete expanded version --> 
     82        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    8483 
    85     <!-- Delete expanded version --> 
    86     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    87  
    88     <!-- Delete the quickstart context def --> 
    89     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    90  
    91     <if> 
    92       <isset property="org.bedework.global.portal.platform" /> 
    93       <then> 
    94         <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    95              inheritrefs="true" target="deploy" /> 
     84        <!-- Delete the quickstart context def --> 
     85        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    9686      </then> 
    9787    </if> 

  • trunk/deployment/webconfig/webapp/build.xml

    r1937 r1938  
    5656    </if> 
    5757 
    58     <echo message="***************************************************************" /> 
    59     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    60     <echo message="***************************************************************" /> 
     58    <if> 
     59      <not> 
     60        <isset property="org.bedework.global.build.ear" /> 
     61      </not> 
     62      <then> 
     63        <echo message="***************************************************************" /> 
     64        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     65        <echo message="***************************************************************" /> 
    6166 
    62     <!-- copy the war file. --> 
    63     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    64           overwrite="yes" /> 
     67        <!-- copy the war file. --> 
     68        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     69              overwrite="yes" /> 
    6570 
    66     <!-- Delete expanded version --> 
    67     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     71        <!-- Delete expanded version --> 
     72        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    6873 
    69     <!-- Delete the quickstart context def --> 
    70     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     74        <!-- Delete the quickstart context def --> 
     75        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     76      </then> 
     77    </if> 
    7178  </target> 
    7279 

  • trunk/deployment/webpublic/webapp/build.xml

    r1937 r1938  
    7474    </if> 
    7575 
    76     <!-- Deploy common resources --> 
    77     <!-- 
    78     <ant antfile="${org.bedework.common.resources}/build.xml" 
    79          inheritrefs="true" target="deploy" > 
    80       <property name="app.common.resources.dest.dir" 
    81                 location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}/resources" /> 
    82     </ant> 
    83     --> 
     76    <if> 
     77      <not> 
     78        <isset property="org.bedework.global.build.ear" /> 
     79      </not> 
     80      <then> 
     81        <echo message="***************************************************************" /> 
     82        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     83        <echo message="***************************************************************" /> 
    8484 
    85     <echo message="***************************************************************" /> 
    86     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    87     <echo message="***************************************************************" /> 
     85        <!-- Delete expanded version --> 
     86        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    8887 
    89     <!-- Delete expanded version --> 
    90     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     88        <!-- copy the war file. --> 
     89        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
     90              file="${app.war.file}" 
     91              overwrite="yes" /> 
    9192 
    92     <!-- copy the war file. --> 
    93     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
    94           file="${app.war.file}" 
    95           overwrite="yes" /> 
    96  
    97     <!-- Delete the quickstart context def --> 
    98     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    99  
    100     <if> 
    101       <isset property="org.bedework.global.portal.platform" /> 
    102       <then> 
    103         <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    104              inheritrefs="true" target="deploy" /> 
     93        <!-- Delete the quickstart context def --> 
     94        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    10595      </then> 
    10696    </if> 

  • trunk/deployment/websubmit/webapp/build.xml

    r1937 r1938  
    7474    </if> 
    7575 
    76     <!-- Deploy common resources --> 
    77     <!-- 
    78     <ant antfile="${org.bedework.common.resources}/build.xml" 
    79          inheritrefs="true" target="deploy" > 
    80       <property name="app.common.resources.dest.dir" 
    81                 location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
    82     </ant> 
    83     --> 
     76    <if> 
     77      <not> 
     78        <isset property="org.bedework.global.build.ear" /> 
     79      </not> 
     80      <then> 
     81        <echo message="***************************************************************" /> 
     82        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     83        <echo message="***************************************************************" /> 
    8484 
    85     <echo message="***************************************************************" /> 
    86     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    87     <echo message="***************************************************************" /> 
     85        <!-- copy the war file. --> 
     86        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     87              overwrite="yes" /> 
    8888 
    89     <!-- copy the war file. --> 
    90     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    91           overwrite="yes" /> 
     89        <!-- Delete expanded version --> 
     90        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    9291 
    93     <!-- Delete expanded version --> 
    94     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    95  
    96     <!-- Delete the quickstart context def --> 
    97     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    98  
    99     <if> 
    100       <isset property="org.bedework.global.portal.platform" /> 
    101       <then> 
    102         <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    103              inheritrefs="true" target="deploy" /> 
     92        <!-- Delete the quickstart context def --> 
     93        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    10494      </then> 
    10595    </if> 

  • trunk/deployment/webuser/portlet/portlet.xml

    r1202 r1938  
    44 
    55  Author: Xavier Lawrence @ jahia . com 
    6   Author: Mike Douglass    douglm@rpi.edu 
     6  Author: Mike Douglass    douglm @ rpi . edu 
    77--> 
    88<portlet-app id="calApp" version="1.0"> 

  • trunk/deployment/webuser/webapp/build.xml

    r1937 r1938  
    5757        </copy> 
    5858 
    59  
    6059        <if> 
    6160          <isset property="org.bedework.global.portal.platform" /> 
    …… 
    7574    </if> 
    7675 
    77     <!-- Deploy common resources --> 
    78     <!-- 
    79     <ant antfile="${org.bedework.common.resources}/build.xml" 
    80          inheritrefs="true" target="deploy" > 
    81       <property name="app.common.resources.dest.dir" 
    82                 location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
    83     </ant> 
    84     --> 
     76    <if> 
     77      <not> 
     78        <isset property="org.bedework.global.build.ear" /> 
     79      </not> 
     80      <then> 
     81        <echo message="***************************************************************" /> 
     82        <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     83        <echo message="***************************************************************" /> 
    8584 
    86     <echo message="***************************************************************" /> 
    87     <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    88     <echo message="***************************************************************" /> 
     85        <!-- copy the war file. --> 
     86        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     87              overwrite="yes" /> 
    8988 
    90     <!-- copy the war file. --> 
    91     <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    92           overwrite="yes" /> 
     89        <!-- Delete expanded version --> 
     90        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    9391 
    94     <!-- Delete expanded version --> 
    95     <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    96  
    97     <!-- Delete the quickstart context def --> 
    98     <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    99  
    100     <if> 
    101       <isset property="org.bedework.global.portal.platform" /> 
    102       <then> 
    103         <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    104              inheritrefs="true" target="deploy" /> 
     92        <!-- Delete the quickstart context def --> 
     93        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    10594      </then> 
    10695    </if>