Changeset 2737

Show
Ignore:
Timestamp:
01/29/10 00:56:24
Author:
douglm
Message:

Transfer all the changes which allow a jboss build of bedework.

Mostly build and deployment changes with a few mbean related changes for the outboard processes, dump/restore, indexer, in/outbox scheduler etc.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.6/build/buildfilters.xml

    r1988 r2737  
    5050    <filter token="LIFERAY-COMPANY-ID" 
    5151            value="${org.bedework.global.liferay.company-id}"/> 
     52 
     53    <filter token="JBOSS-DB-DATASOURCE" 
     54            value="${org.bedework.global.jboss.db.datasource.jndiname}"/> 
    5255 
    5356    <!--      Application settings            --> 

  • releases/bedework-3.6/build/buildsh.xml

    r2368 r2737  
    1818  <import file="${build.dir}/buildfilters.xml" /> 
    1919 
     20  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
     21 
    2022  <target name="init"> 
    2123    <!-- Destinations - where we build stuff --> 
    …… 
    2830    <property name="app.dest.properties" 
    2931              location="${app.dest.classes}/properties/calendar" /> 
    30     <property name="app.dest.resources" 
    31               location="${app.dest.home}/resources" /> 
    3232    <property name="app.dest.data" 
    3333              location="${app.dest.home}/data" /> 
    …… 
    4848    <mkdir dir="${app.dest.lib}" /> 
    4949 
    50     <!-- hibernate jars --> 
    51     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
    52     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
    53     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
    54     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
    55     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
    56     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
    57     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
    58     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
    59     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
    60     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    61     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
    62     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
    63     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
    64  
    65     <!-- jms support --> 
    66     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
    67     <copy todir="${app.dest.lib}" 
    68           file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
    69     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    70  
    71     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
    72  
    73     <!-- core files --> 
    74  
    75     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
    76     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
    77     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
    78  
    79     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
    80     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
    81     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
    82     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
    83     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
    84     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
    85     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
    86     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
    87     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
    88     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
    89     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
    90  
    91     <!-- any extra files--> 
    92    <copy todir="${app.dest.lib}" > 
    93      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    94    </copy> 
    95  
    96     <!-- Some more standard libs --> 
    97     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
    98     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
    99     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
    100     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
    101     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    102     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
    103     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
    104     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
    105     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    106  
    107     <!-- jdbc stuff --> 
    108  
    109     <if> 
    110       <available file="${org.bedework.global.ext.lib}/jdbc" type="dir" /> 
    111       <then> 
    112         <!-- jdbc drivers --> 
    113         <copy todir="${app.dest.lib}" flatten="yes" > 
    114           <!-- local jdbc drivers --> 
    115           <fileset dir="${org.bedework.global.ext.lib}/jdbc"> 
    116             <include name="*.jar"/> 
    117           </fileset> 
    118         </copy> 
    119       </then> 
    120       <else> 
    121         <!-- Include the quickstart jdbc driver --> 
    122         <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/> 
    123       </else> 
    124     </if> 
     50    <!-- Platform specific --> 
     51    <antcall target="addLibs" inheritRefs="true" /> 
    12552 
    12653    <copy todir="${app.dest.classes}"> 
    …… 
    13764          file="${org.bedework.config.sysevents.properties}" /> 
    13865 
    139     <copy todir="${app.dest.classes}" overwrite="yes" > 
    140       <fileset refid="org.bedework.extra.resources" /> 
    141       <filterset refid="property.filters" /> 
    142     </copy> 
     66    <if> 
     67      <isreference refid="org.bedework.extra.resources" /> 
     68      <then> 
     69        <copy todir="${app.dest.classes}" overwrite="yes" > 
     70          <fileset refid="org.bedework.extra.resources" /> 
     71          <filterset refid="property.filters" /> 
     72        </copy> 
     73      </then> 
     74    </if> 
     75 
     76    <!-- Platform specific hibernate properties --> 
     77    <antcall target="doHibProps" inheritRefs="true" /> 
    14378 
    14479    <!-- Create the env.properties file --> 
    …… 
    15287         =============================================================== --> 
    15388 
    154     <copy tofile="${app.dest.resources}/log4j.xml" 
    155           file="${org.bedework.runsh.log4j.xml}" 
    156           failonerror="false" /> 
     89    <!-- Platform specific --> 
     90    <antcall target="addResources" inheritRefs="true" /> 
    15791 
    15892    <!-- =============================================================== 
    …… 
    16094         =============================================================== --> 
    16195 
    162     <mkdir dir="${app.dest.data}" /> 
    163  
    164     <copy todir="${app.dest.data}" overwrite="yes" > 
    165       <fileset refid="org.bedework.shellscr.data" /> 
    166       <filterset refid="property.filters" /> 
    167     </copy> 
     96    <if> 
     97      <isreference refid="org.bedework.shellscr.data" /> 
     98      <then> 
     99        <mkdir dir="${app.dest.data}" /> 
     100     
     101        <copy todir="${app.dest.data}" overwrite="yes" > 
     102          <fileset refid="org.bedework.shellscr.data" /> 
     103          <filterset refid="property.filters" /> 
     104        </copy> 
     105      </then> 
     106    </if> 
    168107 
    169108    <!-- =============================================================== 
    170                        Build the classpath 
     109                       Add any extra stuff 
    171110         =============================================================== --> 
    172111 
    173     <path id="app.run.path"> 
    174       <fileset dir="${app.dest.lib}"> 
    175         <include name="*.jar"/> 
    176       </fileset> 
    177       <pathelement location="${app.dest.resources}" /> 
    178     </path> 
    179     <pathconvert property="app.run.cp" refid="app.run.path" 
    180                  targetos="unix" > 
    181       <map from="${app.dest.lib}" to="./lib"/> 
    182       <map from="${app.dest.resources}" to="./resources"/> 
    183     </pathconvert> 
    184     <pathconvert property="app.run.wincp" refid="app.run.path" 
    185                  targetos="windows" > 
    186       <map from="${app.dest.lib}" to="./lib"/> 
    187       <map from="${app.dest.resources}" to="./resources"/> 
    188     </pathconvert> 
     112    <!-- Platform specific --> 
     113    <antcall target="addExtras" inheritRefs="true" /> 
     114     
     115    <!-- ================================================================ 
     116         Build the zip file 
     117         ================================================================ --> 
    189118 
    190     <!-- =============================================================== 
    191                        Copy and modify the shell script 
    192          =============================================================== --> 
    193  
    194     <copy tofile="${app.dest.home}/${propval.app.shellscr.name}" 
    195           file="${app.run.shellscr}" > 
    196       <filterset> 
    197         <filter token="CP" 
    198                 value=".:./classes:${app.run.cp}"/> 
    199       </filterset> 
    200       <filterset refid="property.filters" /> 
    201     </copy> 
    202  
    203     <copy tofile="${app.dest.home}/${propval.app.batscr.name}" 
    204           file="${app.run.batscr}" > 
    205       <filterset> 
    206         <filter token="CP" 
    207                 value=".;./classes;${app.run.wincp}"/> 
    208       </filterset> 
    209       <filterset refid="property.filters" /> 
    210     </copy> 
    211  
    212     <!-- build the zip file --> 
    213119    <mkdir dir="${dist.home}" /> 
    214120    <delete file="${app.zip.file}" /> 
    …… 
    219125  </target> 
    220126</project> 
    221  

  • releases/bedework-3.6/build/buildwar.xml

    r2430 r2737  
    5353      <isset property="org.bedework.global.build.ear" /> 
    5454      <then> 
    55         <!-- Common library in ear file --> 
    56         <property name="app.dest.lib" 
    57                   location="${org.bedework.ear.templib}" /> 
    58  
    5955        <!-- Properties all go into a single jar file at termination --> 
    6056        <property name="app.dest.classes" 
    …… 
    6258      </then> 
    6359      <else> 
    64         <!-- Library in war file --> 
    65         <property name="app.dest.lib" 
    66                   location="${app.dest.webinf}/lib" /> 
    67  
    6860        <!-- Properties in the war file --> 
    6961        <property name="app.dest.classes" 
    …… 
    242234    <delete file="${app.temp.web.xml}" /> 
    243235 
    244     <!-- Add the contex root to the file. Note that newline is required --> 
     236    <!-- Add the context root to the file. Note that newline is required --> 
    245237    <echo file="${org.bedework.global.context.roots}" append="yes"> 
    246238${propval.app.war.name}.context=${propval.app.context.root} 
    247239    </echo> 
    248240 
    249     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
    250     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
    251     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
    252     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
    253     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
    254     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
    255     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
    256     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
    257     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
    258     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    259     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
    260     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
    261  
    262     <!-- jms support --> 
    263     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
    264     <copy todir="${app.dest.lib}" 
    265           file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
    266     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    267  
    268     <antcall target="bexchange-stuff" inheritRefs="true" /> 
    269     <antcall target="domino-stuff" inheritRefs="true" /> 
    270     <antcall target="google-stuff" inheritRefs="true" /> 
    271  
    272     <!-- =============================================================== 
    273          Any jar files required 
    274          =============================================================== --> 
    275  
    276     <echo message="+++++++++++  bw-logging at ${org.bedework.appjar.bw-logging}" /> 
    277     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
    278     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
    279     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
    280     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
    281     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
    282     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
    283     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
    284     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
    285     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
    286     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
    287     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
    288     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
    289     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
    290     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
    291     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
    292     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
    293  
    294     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
    295     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
    296     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
    297     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    298     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
    299     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
    300     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
    301     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    302  
    303     <!-- Mail related stuff --> 
    304     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
    305     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
    306     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
    307     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
    308     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
    309     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
    310  
    311     <!-- any extra files--> 
    312     <copy todir="${app.dest.lib}" > 
    313       <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    314     </copy> 
     241    <!-- Add libraries: Platform specific --> 
     242    <antcall target="addLibs" inheritRefs="true" /> 
    315243 
    316244    <!-- Platform specific --> 
    317245    <antcall target="doPlatform" inheritRefs="true" /> 
    318246 
    319     <!-- build the war file --> 
     247    <!-- build the war file or directory --> 
    320248    <mkdir dir="${dist.home}" /> 
     249         
     250        <!-- may be there as a file or a directory --> 
    321251    <delete file="${app.war.file}" /> 
    322  
    323     <war warfile="${app.war.file}" 
    324          webxml="${app.dest.web.xml}" 
    325          basedir="${app.dest.war}" 
    326          excludes="WEB-INF/web.xml" /> 
    327   </target> 
    328  
    329   <target name="bexchange-stuff" if="org.bedework.build.caldav.bexchange"> 
    330   </target> 
    331  
    332   <target name="domino-stuff" if="org.bedework.build.caldav.domino"> 
    333   </target> 
    334  
    335   <target name="google-stuff" if="org.bedework.build.caldav.google"> 
    336     <copy todir="${app.dest.lib}"> 
    337       <fileset dir="${google.dir}"> 
    338         <include name="*.jar"/> 
    339       </fileset> 
    340     </copy> 
     252    <delete dir="${app.war.file}" /> 
     253         
     254    <if> 
     255        <or> 
     256                <not> 
     257          <isset property="org.bedework.global.wars.zipped" /> 
     258                </not> 
     259                <istrue value="${org.bedework.global.wars.zipped}"/> 
     260      </or> 
     261      <then> 
     262        <!-- Build a zipped war file --> 
     263        <war warfile="${app.war.file}" 
     264             webxml="${app.dest.web.xml}" 
     265             basedir="${app.dest.war}" 
     266             excludes="WEB-INF/web.xml" /> 
     267      </then> 
     268      <else> 
     269        <!-- Unzipped war file --> 
     270        <copy todir="${app.war.file}"> 
     271          <fileset dir="${app.dest.war}"  includes="*"/> 
     272          <filterset refid="property.filters" /> 
     273        </copy> 
     274      </else> 
     275    </if> 
    341276  </target> 
    342277 
    …… 
    432367    </if> 
    433368 
    434     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
    435     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
    436     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
    437  
    438     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}"/> 
    439     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
    440     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
    441     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
    442     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
    443     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
    444     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
    445     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
    446     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
    447369  </target> 
    448370</project> 

  • releases/bedework-3.6/build/platforms/jbossWar.xml

    r2588 r2737  
    22 
    33<!-- =================================================================== 
    4      This file is imported by buildwar.xml and adds a target 
    5         doPortal 
     4     This file is imported by buildwar.xml and adds the targets 
    65     which will be invoked by the buildwar targets. 
     6        addLibs: add libraries for this platform 
     7        doPlatform - misc stuff 
     8        deployWar: deploy the war to the server 
     9        deployEar: deploy the ear to the server  
    710     =================================================================== --> 
    811 
    912<project name="bedework.platformWar" default="doPlatform" > 
    1013  <target name="doPlatform" > 
    11         <echo message="$$$$$$$$$$$$$$$ jbossWar.xml $$$$$$$$$$$$$$$$$$$$$$$" /> 
    1214    <!-- =============================================================== 
    1315         We create an updated jboss-web.xml file (for jboss) and a ear 
    …… 
    3436    </if> 
    3537  </target> 
     38   
     39  <!-- ================================================================ 
     40       Add libraries 
     41       ================================================================ --> 
     42 
     43  <target name="addLibs"> 
     44    <if> 
     45      <not> 
     46        <isset property="org.bedework.global.build.ear" /> 
     47      </not> 
     48      <then> 
     49        <!-- Library in war file --> 
     50        <property name="app.dest.lib" 
     51                  location="${app.dest.webinf}/lib" /> 
     52        <antcall target="copyLibs" inheritRefs="true" /> 
     53      </then> 
     54      <else> 
     55        <!-- Preserve extra jars for later --> 
     56        <copy todir="${org.bedework.temp.ear.extrajars.dir}" > 
     57          <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     58        </copy> 
     59      </else> 
     60    </if> 
     61  </target> 
     62   
     63  <!-- ================================================================ 
     64       Deploy war 
     65       ================================================================ --> 
     66 
     67  <target name="deployWar"> 
     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="***************************************************************" /> 
     76 
     77        <!-- copy the war file. --> 
     78        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     79              overwrite="yes" /> 
     80 
     81        <!-- Delete expanded version --> 
     82        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     83      </then> 
     84    </if> 
     85  </target> 
     86     
     87  <!-- ================================================================ 
     88       Deploy ear 
     89       ================================================================ --> 
     90 
     91  <target name="deployEar"> 
     92    <!-- Common library in ear file --> 
     93    <property name="app.dest.lib" 
     94              location="${org.bedework.ear.dir}" /> 
     95    <antcall target="copyLibs" inheritRefs="true" /> 
     96 
     97        <!-- And the extra jars we preserved --> 
     98    <copy todir="${app.dest.lib}" > 
     99      <fileset dir="${org.bedework.temp.ear.extrajars.dir}" /> 
     100    </copy> 
     101         
     102    <echo message="***************************************************************" /> 
     103    <echo message="Building ear file for jboss deployment" /> 
     104    <echo message="***************************************************************" /> 
     105 
     106    <jar jarfile="${org.bedework.ear.properties.jar}"> 
     107      <fileset dir="${org.bedework.ear.properties.dir}"/> 
     108    </jar> 
     109 
     110    <path id="app.xml.cp"> 
     111      <pathelement location="${org.bedework.deployutil.jar}"/> 
     112    </path> 
     113 
     114    <taskdef name="applicationXml" 
     115             classname="org.bedework.deployment.ApplicationXmlTask"> 
     116      <classpath refid="app.xml.cp"/> 
     117    </taskdef> 
     118 
     119    <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml 
     120                    warDir=${org.bedework.temp.dir}/wars 
     121                    contexts=${org.bedework.global.context.roots}" /> 
     122 
     123    <applicationXml displayName="Bedework calendar suite" 
     124                    outFile="${org.bedework.ear.dir}/META-INF/application.xml" 
     125                    warDir="${org.bedework.temp.dir}/wars" 
     126                    contexts="${org.bedework.global.context.roots}"> 
     127      <fileset dir="${org.bedework.ear.dir}"> 
     128        <include name="*.jar"/> 
     129      </fileset> 
     130    </applicationXml> 
     131         
     132    <echo file="${org.bedework.ear.dir}/META-INF/jboss-app.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> 
     133<jboss-app> 
     134   <loader-repository>  
     135     org.bedework:archive=@EAR_NAME@  
     136     <loader-repository-config>java2ParentDelegation=false</loader-repository-config>  
     137   </loader-repository>  
     138</jboss-app> 
     139]]></echo> 
     140         
     141    <replace file="${org.bedework.ear.dir}/META-INF/jboss-app.xml" 
     142               token="@EAR_NAME@"  
     143               value="${app.ear.file.name}"/> 
     144             
     145    <manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" /> 
     146 
     147    <if> 
     148      <equals arg1="${org.bedework.global.ear.wars.zipped}" 
     149              arg2="yes" /> 
     150      <then> 
     151        <copy toDir="${org.bedework.ear.dir}"> 
     152          <fileset dir="${dist.home}" 
     153                   includes="*.war" /> 
     154        </copy> 
     155      </then> 
     156      <else> 
     157        <copy toDir="${org.bedework.ear.dir}"> 
     158          <fileset dir="${org.bedework.temp.wars.home}"/> 
     159        </copy> 
     160      </else> 
     161    </if> 
     162 
     163    <if> 
     164      <equals arg1="${org.bedework.global.ear.zipped}" 
     165              arg2="yes" /> 
     166      <then> 
     167         <zip destfile="${org.bedework.ear.file}" 
     168             basedir="${org.bedework.ear.dir}"/> 
     169      </then> 
     170    </if> 
     171 
     172    <!-- copy the ear - at the moment copy the uncompressed. --> 
     173 
     174    <if> 
     175      <isset property="org.bedework.appserver.deploy.dir" /> 
     176      <then> 
     177        <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     178        <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     179        <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 
     180          <fileset dir="${org.bedework.ear.dir}"/> 
     181        </copy> 
     182 
     183        <!-- If requested we also copy in the activemq configuration. --> 
     184 
     185        <if> 
     186          <istrue value="${org.bedework.global.copy.activemq.config}" /> 
     187          <then> 
     188            <copy file="${org.bedework.config.home}/activemq-ra.xml" 
     189                    tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml" 
     190                  overwrite="yes" /> 
     191            <copy file="${org.bedework.config.home}/activemq-broker-config.xml" 
     192                  tofile="${org.bedework.global.activemq.dir}/broker-config.xml" 
     193                  overwrite="yes" /> 
     194            <copy file="${org.bedework.config.home}/activemq-jms-ds.xml" 
     195                  tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml" 
     196                  overwrite="yes" /> 
     197          </then> 
     198        </if> 
     199      </then> 
     200    </if> 
     201  </target> 
     202   
     203  <!-- ================================================================ 
     204       Private target to copy libraries 
     205       ================================================================ --> 
     206 
     207  <target name="copyLibs"> 
     208    <!-- hibernate jars --> 
     209    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     210    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     211    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     212    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     213    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     214    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     215    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     216    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
     217    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
     218    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
     219    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     220 
     221    <if> 
     222      <isset property="org.bedework.build.caldav.google" /> 
     223      <then> 
     224        <copy todir="${app.dest.lib}"> 
     225          <fileset dir="${google.dir}"> 
     226            <include name="*.jar"/> 
     227          </fileset> 
     228        </copy> 
     229      </then> 
     230    </if> 
     231 
     232    <!-- =============================================================== 
     233         Any jar files required 
     234         =============================================================== --> 
     235 
     236    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
     237    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     238    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     239    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     240    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     241    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     242    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     243    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     244    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     245    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     246    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
     247    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     248    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     249    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
     250    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
     251    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
     252 
     253    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     254    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     255    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     256    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     257    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     258    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     259    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     260    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
     261 
     262    <!-- Mail related stuff --> 
     263    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
     264    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
     265    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
     266    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
     267    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
     268    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
     269 
     270    <!-- any extra files--> 
     271    <copy todir="${app.dest.lib}" > 
     272      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     273    </copy> 
     274 
     275        <!-- Add the struts stuff --> 
     276    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
     277    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
     278    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
     279 
     280    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
     281    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     282    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
     283    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
     284    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
     285    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
     286    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
     287  </target> 
    36288</project> 

  • releases/bedework-3.6/build/platforms/tomcat5War.xml

    r2655 r2737  
    22 
    33<!-- =================================================================== 
    4      This file is imported by buildwar.xml and adds a target 
    5         doPlatform 
     4     This file is imported by buildwar.xml and adds the targets 
    65     which will be invoked by the buildwar targets. 
     6        addLibs: add libraries for this platform 
     7        doPlatform - misc stuff 
     8        deployWar: deploy the war to the server 
     9        deployEar: deploy the ear to the server  
    710     =================================================================== --> 
    811 
    …… 
    2023      <filterset refid="property.filters" /> 
    2124    </copy> 
     25  </target> 
     26   
     27  <!-- ================================================================ 
     28       Add libraries 
     29       ================================================================ --> 
     30 
     31  <target name="addLibs"> 
     32    <!-- Library in war file --> 
     33    <property name="app.dest.lib" 
     34              location="${app.dest.webinf}/lib" /> 
     35 
     36    <!-- hibernate jars --> 
     37    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
     38    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
     39    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
     40    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
     41    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
     42    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
     43    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     44    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
     45    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
     46    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
     47    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
     48    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
     49 
     50    <!-- jms support --> 
     51    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
     52    <copy todir="${app.dest.lib}" 
     53          file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
     54    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
     55 
     56    <if> 
     57      <isset property="org.bedework.build.caldav.google" /> 
     58      <then> 
     59        <copy todir="${app.dest.lib}"> 
     60          <fileset dir="${google.dir}"> 
     61            <include name="*.jar"/> 
     62          </fileset> 
     63        </copy> 
     64      </then> 
     65    </if> 
     66 
     67    <!-- =============================================================== 
     68         Any jar files required 
     69         =============================================================== --> 
     70 
     71    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
     72    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
     73    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
     74    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
     75    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
     76    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
     77    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
     78    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
     79    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
     80    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
     81    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-client}" /> 
     82    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
     83    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
     84    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
     85    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
     86    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-appcommon}" /> 
     87 
     88    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
     89    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
     90    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     91    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
     92    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
     93    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
     94    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
     95    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    2296 
    2397    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
     98 
     99    <!-- Mail related stuff --> 
     100    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activation}" /> 
     101    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dsn}" /> 
     102    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.imap}" /> 
     103    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.mailapi}" /> 
     104    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.pop3}" /> 
     105    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.smtp}" /> 
     106 
     107    <!-- any extra files--> 
     108    <copy todir="${app.dest.lib}" > 
     109      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
     110    </copy> 
     111     
     112    <if> 
     113      <isset property="org.bedework.strutsapp" /> 
     114      <then> 
     115        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.serializer}"/> 
     116        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
     117        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.struts}"/> 
     118 
     119        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-beanutils}"/> 
     120        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
     121        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-fileupload}"/> 
     122        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
     123        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-validator}"/> 
     124        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jakarta-oro}"/> 
     125        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
     126        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
     127      </then> 
     128    </if> 
     129  </target> 
     130   
     131  <!-- ================================================================ 
     132       Deploy war 
     133       ================================================================ --> 
     134 
     135  <target name="deployWar"> 
     136    <echo message="***************************************************************" /> 
     137    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
     138    <echo message="***************************************************************" /> 
     139 
     140    <!-- copy the war file. --> 
     141    <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
     142          overwrite="yes" /> 
     143 
     144    <!-- Delete expanded version --> 
     145    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
     146 
     147    <!-- Delete the quickstart context def --> 
     148    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
     149  </target> 
     150     
     151  <!-- ================================================================ 
     152       Deploy ear 
     153       ================================================================ --> 
     154 
     155  <target name="deployEar"> 
     156        <!-- Noop for tomcat --> 
    24157  </target> 
    25158</project> 

  • releases/bedework-3.6/config/bwbuild/default/cal.options.xml

    r2541 r2737  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • releases/bedework-3.6/config/bwbuild/default/cal.properties

    r2621 r2737  
    9191log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
    9292 
    93 # the toplevel directory for the default web application 
    94 webapp.root.dir=${org.bedework.appserver.deploy.dir}/ROOT 
     93# the toplevel directory for the server static resources, relative to the application server home 
     94org.bedework.server.resource.root.dir=webapps/ROOT 
    9595 
    9696#  If jetspeed2 builds are enabled this is where we deploy 
    …… 
    246246org.bedework.app.Events.name=DemoCal 
    247247 
    248  
     248# 
     249# -------------------------------------------------------------------- 
    249250# 
    250251# Feed Server 
    …… 
    259260 
    260261org.bedework.app.Feeder.war.name=feeder 
    261 org.bedework.app.Feeder.context.root=/calfeed 
     262org.bedework.app.Feeder.context.root=/feeder 
    262263# Set for jboss 
    263264#org.bedework.app.Feeder.virtual.host= 
    …… 
    269270org.bedework.app.Feeder.display.name=Demo calendar 
    270271org.bedework.app.Feeder.name=feeder 
    271  
    272272 
    273273# 
    …… 
    416416# -------------------------------------------------------------------- 
    417417# 
    418 # Crawler 
     418# Indexer 
    419419# 
    420420 

  • releases/bedework-3.6/config/bwbuild/default/sysevents.properties

    r2473 r2737  
    33# 
    44java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory 
     5#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory 
     6#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces 
    57 
    68# use the following property to configure the default connector 
    79java.naming.provider.url = tcp://localhost:61616?trace=true 
     10 
     11// Allows us to handle container differences 
     12org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
     13 
     14org.bedework.jms.queue.prefix=queue/ 
    815 
    916# use the following property to specify the JNDI name the connection factory 

  • releases/bedework-3.6/config/bwbuild/jboss/build.properties

    r2588 r2737  
    1616compile.debug=yes 
    1717 
    18 org.bedework.appserver.dir=${user.home}/drop2/jboss/jboss-4.2.2.GA 
    19  
    2018org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME} 
    2119org.bedework.config.home=${env.BEDEWORK_CONFIG} 

  • releases/bedework-3.6/config/bwbuild/jboss/cal.options.xml

    r2444 r2737  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • releases/bedework-3.6/config/bwbuild/jboss/cal.properties

    r2621 r2737  
    1717# 
    1818# Define the names of the applications we want to build 
    19 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,SoEDept,UserCal,\ 
    20  Pubcaldav,Usercaldav,caldavTest,test,dumpres 
     19org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\ 
     21 sysevlog,iosched 
    2122 
    2223# 
    …… 
    2930# 'environment' options used globally by the system. 
    3031# 
    31 org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    32  
    33 # Parameters for shell apps 
    34 org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver 
    35 org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:1701 
     32org.bedework.global.hibernate.dialect=org.hibernate.dialect.DerbyDialect 
     33 
     34# Parameters for shell apps - set the db name in the url below 
     35org.bedework.global.jdbcdriver=org.apache.derby.jdbc.ClientDriver 
     36org.bedework.global.jdbcurl="jdbc:derby://localhost:1527/bedework3p6 
    3637org.bedework.global.jdbcid=sa 
    3738org.bedework.global.jdbcpw= 
     39 
     40# DB Datasource for jboss services 
     41# There doesn't appear to be the extra level of indirection that the jboss-web.xml 
     42# files allow so this will appear directly in the hibernate proeprties file for 
     43# jboss services. 
     44 
     45# Note - apparently the java Property classes preserve trailing blanks 
     46# Hibernate will include that trailing blank as part of the name leading to  
     47# much grief.  
     48org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 
    3849 
    3950# Hibernate caching parameters 
    …… 
    5364org.bedework.global.ear.name=rpical 
    5465 
    55 # This allows us to exclude some libraries when copying files into the ear file. 
    56 # Version we use in bedework may conflict with versions installed in the application 
    57 # server. 
    58 org.bedework.global.ear.lib.excludes=commons-logging*,log4j*,jgroup*,servlet.jsp* 
    59  
    6066# 
    6167# The ear can be zipped or left unzipped. Zipped can be useful for copying 
    6268# Jboss will not tolerate zipped ears and unzipped wars. 
    6369 
    64 # Comment out or set to "no" to disable zipped ear file 
    65 org.bedework.global.ear.zipped=yes 
     70# Comment out or set to "no"/"false" to disable zipped ear file 
     71org.bedework.global.ear.zipped=no 
    6672 
    6773# How would you like your wars sir? zipped or unzipped? 
    68 org.bedework.global.ear.wars.zipped=yes 
     74org.bedework.global.wars.zipped=no 
     75 
    6976# 
    7077# ------------------------------------------------------------------------ 
    …… 
    97104 
    98105#  where the application server lives 
    99 org.bedework.appserver.dir=${org.bedework.project.bedework}/../jboss-4.2.2.GA 
     106org.bedework.appserver.dir=${org.bedework.project.bedework}/../jboss-5.1.0.GA 
    100107 
    101108# name of jboss configuration we are using 
    102 org.bedework.jboss.config=prod 
     109org.bedework.jboss.config=default 
    103110 
    104111# location of jboss configuration we are using 
    …… 
    106113 
    107114# where we deploy 
    108 org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/webapps 
     115org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/bwdeploy 
    109116 
    110117#  where most library files used by all applications go 
    111118appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
     119 
     120# where things like log4j config files go 
     121org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
    112122 
    113123# where 'endorsed' library files go.  These classes override anything 
    114124# the JVM has. This is particularly important for things like Xalan, 
    115125# etc., which can break the application if you choose the wrong version 
    116 appserver.endorsed.dir=${org.bedework.appserver.dir}/common/endorsed 
     126appserver.endorsed.dir=${org.bedework.appserver.dir}/lib/endorsed 
     127 
     128# the toplevel directory for the server static resources, relative to the application server home 
     129org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
    117130 
    118131# where things like log4j config files go 
    119 log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
    120  
    121 # the toplevel directory for the default web application 
    122 webapp.root.dir=${org.bedework.jboss.config.dir}/deploy/jboss-web.deployer/ROOT.war 
    123  
    124 #  If jetspeed2 builds are enabled this is where we deploy 
    125 org.bedework.jetspeed2.deploy.dir=${org.bedework.appserver.deploy.dir}/jetspeed/WEB-INF/deploy 
     132log4j.config.destination=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf 
    126133 
    127134#  Set to yes if you want your log4j.xml overwritten 
    128135org.bedework.deploy.log4j.config=no 
     136 
     137# ------------------------------------------------------------------------ 
     138# ActiveMQ defs 
     139# ------------------------------------------------------------------------ 
     140 
     141org.bedework.global.activemq.dir=${org.bedework.appserver.deploy.dir}/activemq-rar-5.3.0.rar 
     142# 
     143# If set to true or yes will copy in the activemq configuration into the rar 
     144org.bedework.global.copy.activemq.config=yes 
     145 
    129146# 
    130147# ------------------------------------------------------------------------ 
    …… 
    156173# 
    157174 
     175org.bedework.app.tzsvr.war.only=yes 
    158176org.bedework.app.tzsvr.project=bwtzsvr 
    159177org.bedework.app.tzsvr.sou.dir=tzsvr 
    …… 
    166184org.bedework.app.tzsvr.display.name=Bedework timezones server. 
    167185org.bedework.app.tzsvr.name=tzsvr 
    168 org.bedework.app.tzsvr.deploy.dir=/webapps 
     186org.bedework.app.tzsvr.deploy.dir=${org.bedework.appserver.deploy.dir} 
    169187org.bedework.app.tzsvr.logprefix=Tzsvr 
    170188 
    …… 
    189207org.bedework.app.bwconfig.war.name=bwconfig 
    190208org.bedework.app.bwconfig.context.root=/bwconfig 
    191 org.bedework.app.bwconfig.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/bwconfigrsrc 
    192 org.bedework.app.bwconfig.deploy.dir=/webapps 
     209org.bedework.app.bwconfig.resources.dir=${org.bedework.server.resource.root.dir}/bwconfigrsrc 
     210org.bedework.app.bwconfig.deploy.dir=${org.bedework.appserver.deploy.dir} 
    193211org.bedework.app.bwconfig.description=Bedework properties config application 
    194212org.bedework.app.bwconfig.display.name=Bedework Config 
    …… 
    212230# Set for jboss 
    213231#org.bedework.app.CalAdmin.virtual.host= 
    214 org.bedework.app.CalAdmin.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/caladminrsrc 
    215 org.bedework.app.CalAdmin.deploy.dir=/webapps 
    216  
    217 org.bedework.app.CalAdmin.security.domain=demo 
     232org.bedework.app.CalAdmin.resources.dir=${org.bedework.server.resource.root.dir}/caladminrsrc 
     233org.bedework.app.CalAdmin.deploy.dir=${org.bedework.appserver.deploy.dir} 
     234 
     235org.bedework.app.CalAdmin.security.domain=bedeworkdemo 
    218236org.bedework.app.CalAdmin.security.prefix=demo 
    219237org.bedework.app.CalAdmin.transport.guarantee=NONE 
    …… 
    239257# Set for jboss 
    240258#org.bedework.app.EventSubmit.virtual.host= 
    241 org.bedework.app.EventSubmit.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/eventsubmitrsrc 
    242 org.bedework.app.EventSubmit.deploy.dir=/webapps 
    243  
    244 org.bedework.app.EventSubmit.security.domain=demo 
     259org.bedework.app.EventSubmit.resources.dir=${org.bedework.server.resource.root.dir}/eventsubmitrsrc 
     260org.bedework.app.EventSubmit.deploy.dir=${org.bedework.appserver.deploy.dir} 
     261 
     262org.bedework.app.EventSubmit.security.domain=bedeworkdemo 
    245263org.bedework.app.EventSubmit.security.prefix=demo 
    246264org.bedework.app.EventSubmit.transport.guarantee=NONE 
    …… 
    266284# Set for jboss 
    267285#org.bedework.app.Events.virtual.host= 
    268 org.bedework.app.Events.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/calrsrc 
    269 org.bedework.app.Events.deploy.dir=/webapps 
     286org.bedework.app.Events.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc 
     287org.bedework.app.Events.deploy.dir=${org.bedework.appserver.deploy.dir} 
    270288org.bedework.app.Events.cal.suite=MainCampus 
    271289 
    …… 
    273291org.bedework.app.Events.display.name=Demo calendar 
    274292org.bedework.app.Events.name=DemoCal 
     293 
     294# 
     295# -------------------------------------------------------------------- 
     296# 
     297# Feed Server 
     298# 
     299org.bedework.app.Feeder.project=webapps 
     300org.bedework.app.Feeder.sou.dir=feeder 
     301org.bedework.app.Feeder.default.contenttype=text/xml 
     302# need to model feederweb.xml from publicweb.xml  (check session timeout value.  Change from 30 to 1?) 
     303org.bedework.app.Feeder.web.xml=war/WEB-INF/web.xml 
     304org.bedework.app.Feeder.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
     305#org.bedework.app.Feeder.portlet.name=PublicCal 
     306 
     307org.bedework.app.Feeder.war.name=feeder 
     308org.bedework.app.Feeder.context.root=/feeder 
     309# Set for jboss 
     310#org.bedework.app.Feeder.virtual.host= 
     311org.bedework.app.Feeder.resources.dir=${org.bedework.server.resource.root.dir}/calfeedrsrc 
     312org.bedework.app.Feeder.deploy.dir=${org.bedework.appserver.deploy.dir} 
     313org.bedework.app.Feeder.cal.suite=MainCampus 
     314 
     315org.bedework.app.Feeder.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT. 
     316org.bedework.app.Feeder.display.name=Demo calendar 
     317org.bedework.app.Feeder.name=feeder 
    275318 
    276319# 
    …… 
    290333# Set for jboss 
    291334#org.bedework.app.SoEDept.virtual.host= 
    292 org.bedework.app.SoEDept.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/calrsrc 
    293 org.bedework.app.SoEDept.deploy.dir=/webapps 
     335org.bedework.app.SoEDept.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc 
     336org.bedework.app.SoEDept.deploy.dir=${org.bedework.appserver.deploy.dir} 
    294337org.bedework.app.SoEDept.cal.suite=SoEDepartmental 
    295338 
    …… 
    314357# Set for jboss 
    315358#org.bedework.app.UserCal.virtual.host= 
    316 org.bedework.app.UserCal.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/ucalrsrc 
    317 org.bedework.app.UserCal.deploy.dir=/webapps 
    318  
    319 org.bedework.app.UserCal.security.domain=demo 
     359org.bedework.app.UserCal.resources.dir=${org.bedework.server.resource.root.dir}/ucalrsrc 
     360org.bedework.app.UserCal.deploy.dir=${org.bedework.appserver.deploy.dir} 
     361 
     362org.bedework.app.UserCal.security.domain=bedeworkdemo 
    320363org.bedework.app.UserCal.security.prefix=demo 
    321364org.bedework.app.UserCal.transport.guarantee=NONE 
    …… 
    344387org.bedework.app.Pubcaldav.display.name=Bedework public caldav 
    345388org.bedework.app.Pubcaldav.name=DemoPubcaldav 
    346 org.bedework.app.Pubcaldav.deploy.dir=/webapps 
     389org.bedework.app.Pubcaldav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    347390org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    348391 
    …… 
    363406#org.bedework.app.Usercaldav.virtual.host= 
    364407 
    365 org.bedework.app.Usercaldav.security.domain=demo 
     408org.bedework.app.Usercaldav.security.domain=bedeworkdemo 
    366409org.bedework.app.Usercaldav.security.prefix=demo 
    367410org.bedework.app.Usercaldav.transport.guarantee=NONE 
    …… 
    370413org.bedework.app.Usercaldav.display.name=Bedework usercaldav 
    371414org.bedework.app.Usercaldav.name=DemoUsrcaldav 
    372 org.bedework.app.Usercaldav.deploy.dir=/webapps 
     415org.bedework.app.Usercaldav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    373416org.bedework.app.Usercaldav.logprefix=UserCalDav 
    374417 
    …… 
    379422# 
    380423 
     424org.bedework.app.caldavTest.runnable=yes 
    381425org.bedework.app.caldavTest.project=caldavTest 
    382426org.bedework.app.caldavTest.sou.dir=caldavTest 
    …… 
    392436# 
    393437 
     438org.bedework.app.test.runnable=yes 
    394439org.bedework.app.test.project=testsuite 
    395440org.bedework.app.test.sou.dir= 
    …… 
    416461org.bedework.app.dumpres.schema.delimiter=; 
    417462 
     463# 
     464# -------------------------------------------------------------------- 
     465# 
     466# Indexer 
     467# 
     468 
     469org.bedework.app.indexer.project=indexer 
     470org.bedework.app.indexer.sou.dir= 
     471org.bedework.app.indexer.shellscr.name=bwrun 
     472org.bedework.app.indexer.batscr.name=bwrun.bat 
     473org.bedework.app.indexer.zip.name=indexer 
     474org.bedework.app.indexer.description=Bedework indexer application 
     475 
     476# 
     477# -------------------------------------------------------------------- 
     478# 
     479# Server events logger 
     480# 
     481 
     482org.bedework.app.sysevlog.project=calendarapi 
     483org.bedework.app.sysevlog.sou.dir= 
     484org.bedework.app.sysevlog.shellscr.name=bwrun 
     485org.bedework.app.sysevlog.batscr.name=bwrun.bat 
     486org.bedework.app.sysevlog.zip.name=bwsysevlog 
     487org.bedework.app.sysevlog.description=Bedework system events logger application 
     488 
     489# 
     490# -------------------------------------------------------------------- 
     491# 
     492# In/outbox scheduler 
     493# 
     494 
     495org.bedework.app.iosched.project=calendarapi 
     496org.bedework.app.iosched.sou.dir= 
     497org.bedework.app.iosched.shellscr.name=bwrun 
     498org.bedework.app.iosched.batscr.name=bwrun.bat 
     499org.bedework.app.iosched.zip.name=bwiosched 
     500org.bedework.app.iosched.description=Bedework In/outbox scheduler application 
     501 
     502 

  • releases/bedework-3.6/config/bwbuild/jboss/sysevents.properties

    r2439 r2737  
    22# activemq jndi.properties 
    33# 
    4 java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory 
     4#java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory 
    55 
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
    88 
     9// Allows us to handle container differences 
     10#org.bedework.connection.factory.name=java:activemq/QueueConnectionFactory 
     11org.bedework.connection.factory.name=java:jms/BedeworkConnectionFactory 
     12 
     13org.bedework.jms.queue.prefix=activemq/queue/ 
     14 
    915# use the following property to specify the JNDI name the connection factory 
    1016# should appear as. 
    11 connectionFactoryNames = jms/BedeworkConnectionFactory 
     17connectionFactoryNames = activemq/QueueConnectionFactory 
    1218 
    1319# register some queues in JNDI using the form 
    …… 
    1622 
    1723queue.queue/syseventslog = bedework.sysevents.logger 
     24 
     25queue.queue/monitor = bedework.sysevents.monitor 
    1826 
    1927queue.queue/schedulerIn = bedework.scheduleIn 
    …… 
    2634# topic.[jndiName] = [physicalName] 
    2735#topic.MyTopic = example.MyTopic 
    28  
    29  
    30  
    31  
    32  
    33 # 
    34 # context.xml 
    35 #  <Resource name="jms/BedeworkConnectionFactory" 
    36 #            auth="Container" 
    37 #            type="org.apache.activemq.ActiveMQConnectionFactory" 
    38 #            description="JMS Connection Factory" 
    39 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    40 #            brokerURL="tcp://localhost:61616?trace=true" 
    41 #            brokerName="LocalActiveMQBroker"/> 
    42 # 
    43 #  <!-- ActiveMQ System events queue --> 
    44 #  <Resource name="queue/sysevents" 
    45 #            auth="Container" 
    46 #            type="org.apache.activemq.command.ActiveMQQueue" 
    47 #            description="Bedework crawler queue" 
    48 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    49 #            physicalName="bedework.sysevents"/> 
    50 # 
    51 #  <!-- ActiveMQ System events log queue --> 
    52 #  <Resource name="queue/syseventslog" 
    53 #            auth="Container" 
    54 #            type="org.apache.activemq.command.ActiveMQQueue" 
    55 #            description="Bedework crawler queue" 
    56 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    57 #            physicalName="bedework.sysevents.logger"/> 
    58 # 
    59 #  <!-- ActiveMQ index crawler notifications queue --> 
    60 #  <Resource name="queue/crawler" 
    61 #            auth="Container" 
    62 #            type="org.apache.activemq.command.ActiveMQQueue" 
    63 #            description="Bedework crawler queue" 
    64 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    65 #            physicalName="bedework.crawler"/> 

  • releases/bedework-3.6/config/bwbuild/liferay5/cal.properties

    r2376 r2737  
    9191log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
    9292 
    93 # the toplevel directory for the default web application 
    94 webapp.root.dir=${org.bedework.appserver.deploy.dir}/ROOT 
    95  
    96 #  If jetspeed2 builds are enabled this is where we deploy 
    97 org.bedework.jetspeed2.deploy.dir=${org.bedework.appserver.deploy.dir}/jetspeed/WEB-INF/deploy 
     93# the toplevel directory for the server static resources, relative to the application server home 
     94org.bedework.server.resource.root.dir=webapps/ROOT 
    9895 
    9996#  Set to yes if you want your log4j.xml overwritten 

  • releases/bedework-3.6/config/bwbuild/liferay5/sysevents.properties

    r2439 r2737  
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
     8 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
     11 
     12org.bedework.jms.queue.prefix=queue/ 
    813 
    914# use the following property to specify the JNDI name the connection factory 

  • releases/bedework-3.6/config/bwbuild/mysql/cal.options.xml

    r2444 r2737  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • releases/bedework-3.6/config/bwbuild/mysql/cal.properties

    r2621 r2737  
    9191log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
    9292 
    93 # the toplevel directory for the default web application 
    94 webapp.root.dir=${org.bedework.appserver.deploy.dir}/ROOT 
    95  
    96 #  If jetspeed2 builds are enabled this is where we deploy 
    97 org.bedework.jetspeed2.deploy.dir=${org.bedework.appserver.deploy.dir}/jetspeed/WEB-INF/deploy 
     93# the toplevel directory for the server static resources, relative to the application server home 
     94org.bedework.server.resource.root.dir=webapps/ROOT 
    9895 
    9996#  Set to yes if you want your log4j.xml overwritten 

  • releases/bedework-3.6/config/bwbuild/mysql/sysevents.properties

    r2439 r2737  
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
    88 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
     11 
     12org.bedework.jms.queue.prefix=queue/ 
    913# use the following property to specify the JNDI name the connection factory 
    1014# should appear as. 

  • releases/bedework-3.6/config/bwbuild/oracle10g/cal.options.xml

    r2444 r2737  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • releases/bedework-3.6/config/bwbuild/oracle10g/cal.properties

    r2621 r2737  
    9191log4j.config.destination=${org.bedework.appserver.dir}/common/classes 
    9292 
    93 # the toplevel directory for the default web application 
    94 webapp.root.dir=${org.bedework.appserver.deploy.dir}/ROOT 
    95  
    96 #  If jetspeed2 builds are enabled this is where we deploy 
    97 org.bedework.jetspeed2.deploy.dir=${org.bedework.appserver.deploy.dir}/jetspeed/WEB-INF/deploy 
     93# the toplevel directory for the server static resources, relative to the application server home 
     94org.bedework.server.resource.root.dir=webapps/ROOT 
    9895 
    9996#  Set to yes if you want your log4j.xml overwritten 

  • releases/bedework-3.6/config/bwbuild/oracle10g/sysevents.properties

    r2439 r2737  
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
     8 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
     11 
     12org.bedework.jms.queue.prefix=queue/ 
    813 
    914# use the following property to specify the JNDI name the connection factory 

  • releases/bedework-3.6/deployment/build.xml

    r2231 r2737  
    44     This directory and the files within it are to be part of the config 
    55     and deployment process. 
     6      
     7     ======================== new comment ======================== 
     8     Modules are of type and kind. 
     9      
     10     The type is for example, webadmin, usercaldav etc. 
     11      
     12     The kind is webapp, shellscr etc. 
     13      
     14     We cycle over the information we have for each application we want to  
     15     build and for each application use ants property mapping to map the  
     16     properties onto a constant set of names, e.g. the application specific  
     17     name  
     18         org.bedework.app.CalAdmin.deploy.dir 
     19     would be mapped onto  
     20         propval.app.deploy.dir 
     21          
     22     We then look for build.xml files on a path given by the type and kind,  
     23     for example  
     24         webadmin/webapp/build.xml 
     25     or 
     26         indexer/shellscr/build.xml 
     27          
     28     The intent was to allow certain modules to be built in different forms. 
     29     At one point it was also the case that we tried to deal with platform 
     30     specific issues through this scheme. Now that is handled by importing 
     31     platform specific build files into a generic build file. 
     32      
     33     That may allow for some simplification.  
     34     ======================== old comment ======================== 
    635 
    736     A number of properties of the form org.bedework.install.XXX will be 
    8      defined, each indicating that a particualr component is to be deployed. 
     37     defined, each indicating that a particular component is to be deployed. 
    938 
    1039     Targets below will be executed only if that property is defined. 
    …… 
    2352        Add an antcall for each component and a corresponding target 
    2453 
    25      Authors: Mike Douglass   douglm@rpi.edu 
     54     Authors: Mike Douglass   douglm rpi.edu 
    2655     =================================================================== --> 
    2756 
    …… 
    3968            location="${org.bedework.temp.dir}/extrajars" /> 
    4069 
     70  <!-- Preserve extra jars for ear builds --> 
     71  <property name="org.bedework.temp.ear.extrajars.dir" 
     72            location="${org.bedework.temp.dir}/earextrajars" /> 
     73         
    4174  <dirname property="this.build.dir" file="${ant.file}"/> 
    4275  <property name="bedework.deployment.base" location="this.build.dir" /> 
    …… 
    88121        </if> 
    89122 
    90         <!-- 
    91         <property name="org.bedework.ear.templib" 
    92                   location="${org.bedework.ear.dir}/lib" /> 
    93                   --> 
    94         <property name="org.bedework.ear.templib" 
    95                   location="${org.bedework.temp.dir}/earlib" /> 
    96123        <property name="org.bedework.ear.properties.dir" 
    97124                  location="${org.bedework.temp.dir}/ear-properties" /> 
    …… 
    200227 
    201228    <!-- copy startup website that sends you to the applications --> 
    202     <delete dir="${webapp.root.dir}/bedework"/> 
    203     <mkdir dir="${webapp.root.dir}/bedework"/> 
    204     <copy todir="${webapp.root.dir}/bedework"> 
     229        <property name="startup.website.dir" 
     230                  location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" /> 
     231    <delete dir="${startup.website.dir}"/> 
     232    <mkdir dir="${startup.website.dir}"/> 
     233    <copy todir="${startup.website.dir}"> 
    205234      <fileset dir="${app.root.dir}/resources/bedework"/> 
    206235    </copy> 

  • releases/bedework-3.6/deployment/dumprestore/shellscr/build.xml

    r2432 r2737  
    77<project name="bwdumpres.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3335       The "deploy" target first builds a configured component then copies 
    3436       all required files to the appropriate servlet container directories. 
    35  
    36        Currently this only works for the quickstart distribution. 
    37        For example, it does not handle deploying into jboss and copying 
    38        resource files (images, stylesheets) to external locations. 
    3937       ================================================================= --> 
    4038 
    4139  <target name="deploy" depends="init,build.configured" > 
     40    <antcall target="deployService" inheritRefs="true" /> 
    4241  </target> 
    4342 
    4443  <target name="build.configured" depends="init" > 
    45     <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    5044    <property name="app.temp.home" 
    5145              location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    5246    <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    6847 
    69     <mkdir dir="${app.temp.home}/data"/> 
    70     <copy todir="${app.temp.home}/data" file="${app.sou.dir}/resources/initbedework.xml" /> 
     48        <if> 
     49                <equals arg1="jboss" arg2="${org.bedework.global.deploy.platform}"/> 
     50                <then> 
     51        <mkdir dir="${org.bedework.jboss.data.dir}/dumprestore"/> 
     52        <copy todir="${org.bedework.jboss.data.dir}/dumprestore"  
     53              file="${app.sou.dir}/resources/initbedework.xml" /> 
     54        <copy todir="${org.bedework.jboss.data.dir}/dumprestore"  
     55              file="${app.sou.dir}/resources/initbedework-sparse.xml" /> 
     56          </then> 
     57                <else> 
     58        <mkdir dir="${app.temp.home}/data"/> 
     59        <copy todir="${app.temp.home}/data"  
     60                    file="${app.sou.dir}/resources/initbedework.xml" /> 
     61        <copy todir="${app.temp.home}/data"  
     62                    file="${app.sou.dir}/resources/initbedework-sparse.xml" /> 
     63                </else> 
     64    </if> 
    7165 
    72     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    7366    <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    7467 

  • releases/bedework-3.6/deployment/feeder/webapp/build.xml

    r2409 r2737  
    77<project name="bwpublic.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    7678    </if> 
    7779 
    78     <if> 
    79       <not> 
    80         <isset property="org.bedework.global.build.ear" /> 
    81       </not> 
    82       <then> 
    83         <echo message="***************************************************************" /> 
    84         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    85         <echo message="***************************************************************" /> 
    86  
    87         <!-- Delete expanded version --> 
    88         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    89  
    90         <!-- copy the war file. --> 
    91         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" 
    92               file="${app.war.file}" 
    93               overwrite="yes" /> 
    94  
    95         <!-- Delete the quickstart context def --> 
    96         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    97       </then> 
    98     </if> 
     80    <!-- Platform specific --> 
     81    <antcall target="deployWar" inheritRefs="true" /> 
    9982  </target> 
    10083 

  • releases/bedework-3.6/deployment/indexer/shellscr/build.xml

    r2432 r2737  
    77<project name="indexer.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    4042 
    4143  <target name="deploy" depends="init,build.configured" > 
     44    <antcall target="deployService" inheritRefs="true" /> 
    4245  </target> 
    4346 
    4447  <target name="build.configured" depends="init" > 
    45     <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    50     <property name="app.temp.home" 
    51               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    52     <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    68  
    69     <mkdir dir="${app.temp.home}/data"/> 
    70  
    71     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    72     <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    73  
    7448    <!-- =============================================================== 
    7549         Build the shell script 

  • releases/bedework-3.6/deployment/inoutsched/shellscr/build.xml

    r2432 r2737  
    77<project name="bwcrawler.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    4042 
    4143  <target name="deploy" depends="init,build.configured" > 
     44    <antcall target="deployService" inheritRefs="true" /> 
    4245  </target> 
    4346 
    4447  <target name="build.configured" depends="init" > 
    45     <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    50     <property name="app.temp.home" 
    51               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    52     <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    68  
    69     <mkdir dir="${app.temp.home}/data"/> 
    70  
    71     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    72     <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    73  
    7448    <!-- =============================================================== 
    7549         Build the shell script 

  • releases/bedework-3.6/deployment/publiccaldav/webapp/build.xml

    r1938 r2737  
    77<project name="bwpubcaldav.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3840 
    3941  <target name="deploy" depends="init,build.configured" > 
    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="***************************************************************" /> 
    48  
    49         <!-- copy the war file. --> 
    50         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    51               overwrite="yes" /> 
    52  
    53         <!-- Delete expanded version --> 
    54         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    55  
    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> 
     42    <!-- Platform specific --> 
     43    <antcall target="deployWar" inheritRefs="true" /> 
    6044  </target> 
    6145 

  • releases/bedework-3.6/deployment/sysevlog/shellscr/build.xml

    r2432 r2737  
    77<project name="bwcrawler.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    4042 
    4143  <target name="deploy" depends="init,build.configured" > 
     44    <antcall target="deployService" inheritRefs="true" /> 
    4245  </target> 
    4346 
    4447  <target name="build.configured" depends="init" > 
    45     <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    50     <property name="app.temp.home" 
    51               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    52     <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    68  
    69     <mkdir dir="${app.temp.home}/data"/> 
    70  
    71     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    72     <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    73  
    7448    <!-- =============================================================== 
    7549         Build the shell script 

  • releases/bedework-3.6/deployment/termination/shellscr/build.xml

    r952 r2737  
    55     =================================================================== --> 
    66 
    7 <project name="bwpubcaldav.deploy" default="deploy" > 
     7<project name="bwdeploy.termination" default="deploy" > 
    88  <target name="init"> 
    99  </target> 

  • releases/bedework-3.6/deployment/termination/webapp/build.xml

    r1991 r2737  
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    99 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
     11 
     12  <dirname property="this.dir" file="${ant.file}"/> 
     13 
    1014  <target name="init"> 
    11     <dirname property="this.dir" file="${ant.file}"/> 
    12  
    1315  </target> 
    1416 
    …… 
    2123      <isset property="org.bedework.global.build.ear" /> 
    2224      <then> 
    23         <echo message="***************************************************************" /> 
    24         <echo message="Building ear file for jboss deployment" /> 
    25         <echo message="***************************************************************" /> 
    26  
    27         <jar jarfile="${org.bedework.ear.properties.jar}"> 
    28           <fileset dir="${org.bedework.ear.properties.dir}"/> 
    29         </jar> 
    30  
    31         <path id="app.xml.cp"> 
    32           <pathelement location="${org.bedework.deployutil.jar}"/> 
    33         </path> 
    34  
    35         <taskdef name="applicationXml" 
    36                  classname="org.bedework.deployment.ApplicationXmlTask"> 
    37           <classpath refid="app.xml.cp"/> 
    38         </taskdef> 
    39  
    40         <!-- We have to drop some of the libraries so they don't conflict --> 
    41         <copy toDir="${org.bedework.ear.dir}"> 
    42           <fileset dir="${org.bedework.ear.templib}" 
    43                    excludes="${org.bedework.global.ear.lib.excludes}" /> 
    44         </copy> 
    45  
    46         <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml 
    47                         warDir=${org.bedework.temp.dir}/wars 
    48                         contexts=${org.bedework.global.context.roots}" /> 
    49  
    50         <applicationXml displayName="Bedework calendar suite" 
    51                         outFile="${org.bedework.ear.dir}/META-INF/application.xml" 
    52                         warDir="${org.bedework.temp.dir}/wars" 
    53                         contexts="${org.bedework.global.context.roots}"> 
    54           <fileset dir="${org.bedework.ear.dir}"> 
    55             <include name="*.jar"/> 
    56           </fileset> 
    57         </applicationXml> 
    58  
    59         <manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" /> 
    60  
    61         <if> 
    62           <equals arg1="${org.bedework.global.ear.wars.zipped}" 
    63                   arg2="yes" /> 
    64           <then> 
    65             <copy toDir="${org.bedework.ear.dir}"> 
    66               <fileset dir="${dist.home}" 
    67                        includes="*.war" /> 
    68             </copy> 
    69           </then> 
    70           <else> 
    71             <copy toDir="${org.bedework.ear.dir}"> 
    72               <fileset dir="${org.bedework.temp.wars.home}"/> 
    73             </copy> 
    74           </else> 
    75         </if> 
    76  
    77         <if> 
    78           <equals arg1="${org.bedework.global.ear.zipped}" 
    79                   arg2="yes" /> 
    80           <then> 
    81              <zip destfile="${org.bedework.ear.file}" 
    82                  basedir="${org.bedework.ear.dir}"/> 
    83           </then> 
    84         </if> 
    85  
    86         <!-- copy the ear - at the moment copy the uncompressed. --> 
    87  
    88         <if> 
    89           <isset property="org.bedework.appserver.deploy.dir" /> 
    90           <then> 
    91             <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
    92             <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
    93             <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 
    94               <fileset dir="${org.bedework.ear.dir}"/> 
    95             </copy> 
    96           </then> 
    97         </if> 
     25        <!-- Platform specific --> 
     26        <antcall target="deployEar" inheritRefs="true" /> 
    9827      </then> 
    9928    </if> 

  • releases/bedework-3.6/deployment/testsuite/shellscr/build.xml

    r2432 r2737  
    4343 
    4444  <target name="build.configured" depends="init" > 
    45     <!-- Extra resources --> 
    46     <property name="app.temp.home" 
    47               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    48     <mkdir dir="${app.temp.home}"/> 
    49     <mkdir dir="${app.temp.home}/resources"/> 
    50     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    51 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    52 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    53 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    54 hibernate.connection.username=${org.bedework.global.jdbcid} 
    55 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    56 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    57 hibernate.bytecode.use_reflection_optimizer=false 
    58 hibernate.cache.use_second_level_cache=false 
    59 # 
    60 # Here for better debugging 
    61 # 
    62 hibernate.jdbc.batch_size=0 
    63     </echo> 
    64  
    65     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    66  
    67     <fileset id="org.bedework.shellscr.data" dir="${org.bedework.empty.dir}" > 
    68     </fileset> 
    69  
    7045    <!-- =============================================================== 
    7146         Build the shell script 

  • releases/bedework-3.6/deployment/tzsvr/webapp/build.xml

    r1998 r2737  
    77<project name="bwpubcaldav.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="deployer.dir" file="${ant.file}"/> 
    …… 
    3234 
    3335  <target name="deploy" depends="init,build.configured" > 
    34     <if> 
    35       <not> 
    36         <isset property="org.bedework.global.build.ear" /> 
    37       </not> 
    38       <then> 
    39         <echo message="***************************************************************" /> 
    40         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    41         <echo message="***************************************************************" /> 
    42  
    43         <!-- copy the war file. --> 
    44         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    45               overwrite="yes" /> 
    46  
    47         <!-- Delete expanded version --> 
    48         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    49  
    50         <!-- Delete the quickstart context def --> 
    51         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    52       </then> 
    53     </if> 
     36    <!-- Platform specific --> 
     37    <antcall target="deployWar" inheritRefs="true" /> 
    5438  </target> 
    5539 

  • releases/bedework-3.6/deployment/usercaldav/webapp/build.xml

    r1938 r2737  
    77<project name="bwusercaldav.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3739 
    3840  <target name="deploy" depends="init,build.configured" > 
    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="***************************************************************" /> 
    47  
    48         <!-- copy the war file. --> 
    49         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    50               overwrite="yes" /> 
    51  
    52         <!-- Delete expanded version --> 
    53         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    54  
    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> 
     41    <!-- Platform specific --> 
     42    <antcall target="deployWar" inheritRefs="true" /> 
    5943  </target> 
    6044 

  • releases/bedework-3.6/deployment/webadmin/webapp/build.xml

    r1956 r2737  
    77<project name="bwadmin.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    6870    </if> 
    6971 
    70     <if> 
    71       <not> 
    72         <isset property="org.bedework.global.build.ear" /> 
    73       </not> 
    74       <then> 
    75         <echo message="***************************************************************" /> 
    76         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    77         <echo message="***************************************************************" /> 
    78  
    79         <!-- copy the war file. --> 
    80         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    81               overwrite="yes" /> 
    82  
    83         <!-- Delete expanded version --> 
    84         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    85  
    86         <!-- Delete the quickstart context def --> 
    87         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    88       </then> 
    89     </if> 
     72    <!-- Platform specific --> 
     73    <antcall target="deployWar" inheritRefs="true" /> 
    9074  </target> 
    9175 

  • releases/bedework-3.6/deployment/webconfig/webapp/build.xml

    r1956 r2737  
    77<project name="bwconfig.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    5860    </if> 
    5961 
    60     <if> 
    61       <not> 
    62         <isset property="org.bedework.global.build.ear" /> 
    63       </not> 
    64       <then> 
    65         <echo message="***************************************************************" /> 
    66         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    67         <echo message="***************************************************************" /> 
    68  
    69         <!-- copy the war file. --> 
    70         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    71               overwrite="yes" /> 
    72  
    73         <!-- Delete expanded version --> 
    74         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    75  
    76         <!-- Delete the quickstart context def --> 
    77         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    78       </then> 
    79     </if> 
     62    <!-- Platform specific --> 
     63    <antcall target="deployWar" inheritRefs="true" /> 
    8064  </target> 
    8165 

  • releases/bedework-3.6/deployment/webpublic/webapp/build.xml

    r2541 r2737  
    77<project name="bwpublic.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    3335              --> 
    3436 
    35         <echo message="XXXXXXXXXXXXXXXXXXXXXXX  app.resources.dir=${app.resources.dir}" /> 
    3637    <property name="app.resources.dir" 
    3738              location="${this.dir}/resources" /> 
    …… 
    7879    </if> 
    7980 
    80     <if> 
    81       <not> 
    82         <isset property="org.bedework.global.build.ear" /> 
    83       </not> 
    84       <then> 
    85         <echo message="***************************************************************" /> 
    86         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    87         <echo message="***************************************************************" /> 
    88  
    89         <!-- Delete expanded version --> 
    90         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    91  
    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       </then> 
    100     </if> 
     81    <!-- Platform specific --> 
     82    <antcall target="deployWar" inheritRefs="true" /> 
    10183  </target> 
    10284 

  • releases/bedework-3.6/deployment/websubmit/webapp/build.xml

    r1956 r2737  
    77<project name="bwsubmit.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    7678    </if> 
    7779 
    78     <if> 
    79       <not> 
    80         <isset property="org.bedework.global.build.ear" /> 
    81       </not> 
    82       <then> 
    83         <echo message="***************************************************************" /> 
    84         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    85         <echo message="***************************************************************" /> 
    86  
    87         <!-- copy the war file. --> 
    88         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    89               overwrite="yes" /> 
    90  
    91         <!-- Delete expanded version --> 
    92         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    93  
    94         <!-- Delete the quickstart context def --> 
    95         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    96       </then> 
    97     </if> 
     80    <!-- Platform specific --> 
     81    <antcall target="deployWar" inheritRefs="true" /> 
    9882  </target> 
    9983 

  • releases/bedework-3.6/deployment/webuser/webapp/build.xml

    r1956 r2737  
    77<project name="bwpersonal.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
     10  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    911 
    1012  <dirname property="this.dir" file="${ant.file}"/> 
    …… 
    7678    </if> 
    7779 
    78     <if> 
    79       <not> 
    80         <isset property="org.bedework.global.build.ear" /> 
    81       </not> 
    82       <then> 
    83         <echo message="***************************************************************" /> 
    84         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    85         <echo message="***************************************************************" /> 
    86  
    87         <!-- copy the war file. --> 
    88         <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}" file="${app.war.file}" 
    89               overwrite="yes" /> 
    90  
    91         <!-- Delete expanded version --> 
    92         <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" /> 
    93  
    94         <!-- Delete the quickstart context def --> 
    95         <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    96       </then> 
    97     </if> 
     80    <!-- Platform specific --> 
     81    <antcall target="deployWar" inheritRefs="true" /> 
    9882  </target> 
    9983