Changeset 268

Show
Ignore:
Timestamp:
03/07/06 13:59:00
Author:
douglm
Message:

Preliminary changes to improve building for different platforms and configurations.

Make standalone deploy property global - i.e. it's all standalone or no standalone
Make portal platform property global
Add global j2ee platform property - if set we build a ear file.

Moved caldav deployment stuff to webapp directory instead of servlet

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildwar.xml

    r65 r268  
    4343 
    4444<project name="uwcal.buildwar" default="build" > 
    45   <target name="init"> 
     45  <target name="init" depends="init.common,init.j2ee,init.standalone" /> 
     46 
     47  <target name="init.common"> 
    4648    <condition property="org.bedework.build.for.jetspeed2"> 
    4749      <equals arg1="jetspeed2" arg2="${propval.portal.platform}"/> 
    4850    </condition> 
    4951 
     52    <condition property="org.bedework.build.for.jboss"> 
     53      <equals arg1="jboss" arg2="${org.bedework.global.j2ee.platform}"/> 
     54    </condition> 
     55 
    5056    <!-- Destinations - where we build an unwrapped war --> 
    5157    <property name="app.dest.home" 
    52               location="${org.bedework.temp.wars.home}/${propval.war.name}" /> 
     58              location="${org.bedework.temp.wars.home}/${propval.war.name}.war" /> 
    5359    <property name="app.dest.war" 
    5460              location="${app.dest.home}/war" /> 
    …… 
    5763    <property name="app.dest.webinf" 
    5864              location="${app.dest.war}/WEB-INF" /> 
    59     <property name="app.dest.lib" 
    60               location="${app.dest.webinf}/lib" /> 
    6165    <property name="app.dest.classes" 
    6266              location="${app.dest.webinf}/classes" /> 
    …… 
    7680    <property name="app.sou.properties" 
    7781              location="${app.sou.dir}/war/WEB-INF/classes/servlet.properties" /> 
    78    </target> 
     82  </target> 
     83 
     84  <target name="init.standalone" if="org.bedework.global.build.standalone.app"> 
     85    <property name="app.dest.lib" 
     86              location="${app.dest.webinf}/lib" /> 
     87  </target> 
     88 
     89  <target name="init.j2ee" if="org.bedework.global.j2ee.platform"> 
     90    <property name="app.dest.lib" 
     91              location="${org.bedework.temp.home}/ear/lib" /> 
     92  </target> 
    7993 
    8094  <target name="build" depends="init"> 
    …… 
    247261         excludes="${app.dest.web.xml}" /> 
    248262 
    249     <!-- build the ear file for a j2ee app --> 
     263    <!-- build the ear file for a j2ee app 
    250264    <antcall target="build.ear" inheritRefs="true" /> 
     265    --> 
    251266  </target> 
    252267 
    …… 
    362377       ================================================================= --> 
    363378 
    364   <target name="jboss-stuff" if="cal.j2ee.jboss"> 
     379  <target name="jboss-stuff" if="org.bedework.build.for.jboss"> 
    365380    <copy todir="${app.dest.webinf}" 
    366381          file="${app.sou.dir}/war/WEB-INF/jboss-web.xml"> 

  • trunk/calendar3/config/configs/democal.properties

    r75 r268  
    2727org.bedework.global.calintfclass=org.bedework.calcore.hibernate.CalintfImpl 
    2828org.bedework.global.directory.browsing.disallowed=false 
     29org.bedework.global.build.standalone.app=true 
    2930 
    3031# 
    …… 
    6162org.bedework.webconfig.app.version=3.0 
    6263org.bedework.webconfig.app.default.contenttype=text/xml 
    63 org.bedework.webconfig.build.standalone.app=true 
    6464org.bedework.webconfig.war.name=bwconfig 
    6565org.bedework.webconfig.context.root=bwconfig 
    …… 
    7575# -------------------------------------------------------------------- 
    7676# 
    77 # Standalone Admin Web Client 
     77# Admin Web Client 
    7878# 
    7979org.bedework.webadmin.app.version=3.0 
    …… 
    8282org.bedework.webadmin.env.prefix=org.bedework.webadmin. 
    8383 
    84 org.bedework.webadmin.build.standalone.app=true 
    8584org.bedework.webadmin.war.name=caladmin 
    8685org.bedework.webadmin.deploy.j2ee=false 
    …… 
    115114# -------------------------------------------------------------------- 
    116115# 
    117 # Standalone Public Web Client 
     116# Public Web Client 
    118117# 
    119118org.bedework.webpubevents.app.version=3.0 
    …… 
    122121org.bedework.webpubevents.env.prefix=org.bedework.webpubevents. 
    123122 
    124 org.bedework.webpubevents.build.standalone.app=true 
    125123org.bedework.webpubevents.war.name=cal 
    126124org.bedework.webpubevents.deploy.j2ee=false 
    …… 
    147145# -------------------------------------------------------------------- 
    148146# 
    149 # Standalone Personal Web Client 
     147# Personal Web Client 
    150148# 
    151149org.bedework.webpersonal.app.version=3.0 
    …… 
    154152org.bedework.webpersonal.env.prefix=org.bedework.webpersonal. 
    155153 
    156 org.bedework.webpersonal.build.standalone.app=true 
    157154org.bedework.webpersonal.war.name=ucal 
    158155org.bedework.webpersonal.deploy.j2ee=false 

  • trunk/calendar3/deployment/build.xml

    r59 r268  
    5353    <delete dir="${org.bedework.temp.wars.home}" /> 
    5454 
    55     <!-- ======================= webconfig ================= --> 
    56     <ant antfile="${org.bedework.deployment.base}/webconfig/webapp/build.xml" 
    57          inheritrefs="true" target="build.configured" /> 
    58  
    59     <antcall target="build.webadmin.webapp" inheritrefs="true" /> 
    60  
    61     <antcall target="build.webadmin.portal" inheritrefs="true" /> 
    62  
    63     <antcall target="build.pubevents.webapp" inheritrefs="true" /> 
    64  
    65     <antcall target="build.pubevents.portal" inheritrefs="true" /> 
    66  
    67     <antcall target="build.personal.webapp" inheritrefs="true" /> 
    68  
    69     <antcall target="build.personal.portal" inheritrefs="true" /> 
    70  
    71     <antcall target="build.public.caldav" inheritrefs="true" /> 
    72  
    73     <antcall target="build.personal.caldav" inheritrefs="true" /> 
     55    <antcall target="build.standalone.apps" inheritrefs="true" /> 
     56 
     57    <antcall target="build.portal.apps" inheritrefs="true" /> 
     58 
     59    <antcall target="build.j2ee.apps" inheritrefs="true" /> 
    7460 
    7561    <!-- dump restore - always built (until we have a choice of windows/unix. --> 
    …… 
    8470       ================================================================= --> 
    8571 
    86   <target name="build.webadmin.webapp" if="org.bedework.webadmin.build.standalone.app" > 
    87     <!-- ======================= webadmin - standalone ================= --> 
    88     <ant antfile="${org.bedework.deployment.base}/webadmin/webapp/build.xml" 
     72  <target name="build.standalone.apps" if="org.bedework.global.build.standalone.app" > 
     73    <!-- ======================= webconfig - only standalone ================= --> 
     74    <ant antfile="${org.bedework.deployment.base}/webconfig/webapp/build.xml" 
    8975         inheritrefs="true" target="build.configured" /> 
    90   </target> 
    91  
    92   <target name="build.webadmin.portal" if="org.bedework.webadmin.portal.platform" > 
    93     <!-- ======================= webadmin - portal ================= --> 
    94     <ant antfile="${org.bedework.deployment.base}/webadmin/${admin.portal.platform}/build.xml" 
    95          inheritrefs="true" target="build.configured" /> 
    96   </target> 
    97  
    98   <target name="build.pubevents.webapp" if="org.bedework.webpubevents.build.standalone.app" > 
    99     <!-- ======================= pubevents - standalone ================= --> 
    100     <ant antfile="${org.bedework.deployment.base}/webpublic/webapp/build.xml" 
    101          inheritrefs="true" target="build.configured" /> 
    102   </target> 
    103  
    104   <target name="build.pubevents.portal" if="org.bedework.webpubevents.portal.platform" > 
    105     <!-- ======================= pubevents - portal ================= --> 
    106     <ant antfile="${org.bedework.deployment.base}/webpublic/${pubevents.portal.platform}/build.xml" 
    107          inheritrefs="true" target="build.configured" /> 
    108   </target> 
    109  
    110   <target name="build.personal.webapp" if="org.bedework.webpersonal.build.standalone.app" > 
    111     <!-- ======================= pubevents - standalone ================= --> 
    112     <ant antfile="${org.bedework.deployment.base}/webuser/webapp/build.xml" 
    113          inheritrefs="true" target="build.configured" /> 
    114   </target> 
    115  
    116   <target name="build.personal.portal" if="org.bedework.webpersonal.portal.platform" > 
    117     <!-- ======================= pubevents - portal ================= --> 
    118     <ant antfile="${org.bedework.deployment.base}/webuser/${personal.portal.platform}/build.xml" 
    119          inheritrefs="true" target="build.configured" /> 
    120   </target> 
    121  
    122   <target name="build.public.caldav" if="org.bedework.install.public.caldav" > 
    123     <!-- ======================= caldav - public ================= --> 
    124     <ant antfile="${org.bedework.deployment.base}/publiccaldav/servlet/build.xml" 
    125          inheritrefs="true" target="build.configured" /> 
    126   </target> 
    127  
    128   <target name="build.personal.caldav" if="org.bedework.install.personal.caldav" > 
    129     <!-- ======================= caldav - user ================= --> 
    130     <ant antfile="${org.bedework.deployment.base}/usercaldav/servlet/build.xml" 
    131          inheritrefs="true" target="build.configured" /> 
     76 
     77    <build.configured.apps kind="webapp" /> 
     78  </target> 
     79 
     80  <target name="build.portal.apps" if="org.bedework.global.portal.platform" > 
     81    <build.configured.apps kind="${org.bedework.global.portal.platform}" /> 
     82  </target> 
     83 
     84  <target name="build.j2ee.apps" if="org.bedework.global.j2ee.platform" > 
     85    <build.configured.apps kind="${org.bedework.global.j2ee.platform}" /> 
    13286  </target> 
    13387 
    …… 
    14094    <delete dir="${org.bedework.temp.wars.home}" /> 
    14195 
    142     <!-- ======================= webconfig ================= --> 
    143     <ant antfile="${org.bedework.deployment.base}/webconfig/webapp/build.xml" 
    144          inheritrefs="true" target="deploy" /> 
    145  
    146     <antcall target="webadmin.webapp" inheritrefs="true" /> 
    147  
    148     <antcall target="webadmin.portal" inheritrefs="true" /> 
    149  
    150     <antcall target="pubevents.webapp" inheritrefs="true" /> 
    151  
    152     <antcall target="pubevents.portal" inheritrefs="true" /> 
    153  
    154     <antcall target="personal.webapp" inheritrefs="true" /> 
    155  
    156     <antcall target="personal.portal" inheritrefs="true" /> 
    157  
    158     <antcall target="public.caldav" inheritrefs="true" /> 
    159  
    160     <antcall target="personal.caldav" inheritrefs="true" /> 
     96    <antcall target="deploy.standalone.apps" inheritrefs="true" /> 
     97 
     98    <antcall target="deploy.portal.apps" inheritrefs="true" /> 
     99 
     100    <antcall target="deploy.j2ee.apps" inheritrefs="true" /> 
    161101 
    162102    <!-- copy an index file that sends you to the applications --> 
    …… 
    175115       ================================================================= --> 
    176116 
    177   <target name="webadmin.webapp" if="org.bedework.webadmin.build.standalone.app" > 
    178     <!-- ======================= webadmin - standalone ================= --> 
    179     <ant antfile="${org.bedework.deployment.base}/webadmin/webapp/build.xml" 
     117  <target name="deploy.standalone.apps" if="org.bedework.global.build.standalone.app" > 
     118    <!-- ======================= webconfig - only standalone ================= --> 
     119    <ant antfile="${org.bedework.deployment.base}/webconfig/webapp/build.xml" 
    180120         inheritrefs="true" target="deploy" /> 
    181   </target> 
    182  
    183   <target name="webadmin.portal" if="org.bedework.webadmin.portal.platform" > 
    184     <!-- ======================= webadmin - portal ================= --> 
    185     <ant antfile="${org.bedework.deployment.base}/webadmin/${admin.portal.platform}/build.xml" 
    186          inheritrefs="true" target="deploy" /> 
    187   </target> 
    188  
    189   <target name="pubevents.webapp" if="org.bedework.webpubevents.build.standalone.app" > 
    190     <!-- ======================= pubevents - standalone ================= --> 
    191     <ant antfile="${org.bedework.deployment.base}/webpublic/webapp/build.xml" 
    192          inheritrefs="true" target="deploy" /> 
    193   </target> 
    194  
    195   <target name="pubevents.portal" if="org.bedework.webpubevents.portal.platform" > 
    196     <!-- ======================= pubevents - portal ================= --> 
    197     <ant antfile="${org.bedework.deployment.base}/webpublic/${pubevents.portal.platform}/build.xml" 
    198          inheritrefs="true" target="deploy" /> 
    199   </target> 
    200  
    201   <target name="personal.webapp" if="org.bedework.webpersonal.build.standalone.app" > 
    202     <!-- ======================= pubevents - standalone ================= --> 
    203     <ant antfile="${org.bedework.deployment.base}/webuser/webapp/build.xml" 
    204          inheritrefs="true" target="deploy" /> 
    205   </target> 
    206  
    207   <target name="personal.portal" if="org.bedework.webpersonal.portal.platform" > 
    208     <!-- ======================= pubevents - portal ================= --> 
    209     <ant antfile="${org.bedework.deployment.base}/webuser/${personal.portal.platform}/build.xml" 
    210          inheritrefs="true" target="deploy" /> 
    211   </target> 
    212  
    213   <target name="public.caldav" if="org.bedework.install.public.caldav" > 
    214     <!-- ======================= caldav - public ================= --> 
    215     <ant antfile="${org.bedework.deployment.base}/publiccaldav/servlet/build.xml" 
    216          inheritrefs="true" target="deploy" /> 
    217   </target> 
    218  
    219   <target name="personal.caldav" if="org.bedework.install.personal.caldav" > 
    220     <!-- ======================= caldav - user ================= --> 
    221     <ant antfile="${org.bedework.deployment.base}/usercaldav/servlet/build.xml" 
    222          inheritrefs="true" target="deploy" /> 
     121 
     122    <deploy.apps kind="webapp" /> 
     123  </target> 
     124 
     125  <target name="deploy.portal.apps" if="org.bedework.global.portal.platform" > 
     126    <deploy.apps kind="${org.bedework.global.portal.platform}" /> 
     127  </target> 
     128 
     129  <target name="deploy.j2ee.apps" if="org.bedework.global.j2ee.platform" > 
     130    <deploy.apps kind="${org.bedework.global.j2ee.platform}" /> 
    223131  </target> 
    224132 
    …… 
    241149    <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/> 
    242150  </target> 
     151 
     152  <!-- ================================================================= 
     153       Targets called by the build.configured target. Each is conditional on a 
     154       config property and each executes a build file in a subdirectory of 
     155       this component. 
     156       ================================================================= --> 
     157  <macrodef name="build.configured.apps"> 
     158      <attribute name="kind" /> 
     159    <sequential> 
     160      <!-- ======================= webadmin ================= --> 
     161      <ant antfile="${org.bedework.deployment.base}/webadmin/@{kind}/build.xml" 
     162           inheritrefs="true" target="build.configured" /> 
     163 
     164      <!-- ======================= pubevents ================= --> 
     165      <ant antfile="${org.bedework.deployment.base}/webpublic/@{kind}/build.xml" 
     166           inheritrefs="true" target="build.configured" /> 
     167 
     168      <!-- ======================= personal ================= --> 
     169      <ant antfile="${org.bedework.deployment.base}/webuser/@{kind}/build.xml" 
     170           inheritrefs="true" target="build.configured" /> 
     171 
     172      <!-- ======================= caldav - public ================= --> 
     173      <ant antfile="${org.bedework.deployment.base}/publiccaldav/@{kind}/build.xml" 
     174           inheritrefs="true" target="build.configured" /> 
     175 
     176      <!-- ======================= caldav - user ================= --> 
     177      <ant antfile="${org.bedework.deployment.base}/usercaldav/@{kind}/build.xml" 
     178           inheritrefs="true" target="build.configured" /> 
     179 
     180      <!-- ======================= termination tasks ================= --> 
     181      <ant antfile="${org.bedework.deployment.base}/termination/@{kind}/build.xml" 
     182           inheritrefs="true" target="build.configured" /> 
     183    </sequential> 
     184  </macrodef> 
     185 
     186  <macrodef name="deploy.apps"> 
     187      <attribute name="kind" /> 
     188    <sequential> 
     189      <!-- ======================= webadmin ================= --> 
     190      <ant antfile="${org.bedework.deployment.base}/webadmin/@{kind}/build.xml" 
     191           inheritrefs="true" target="deploy" /> 
     192 
     193      <!-- ======================= pubevents ================= --> 
     194      <ant antfile="${org.bedework.deployment.base}/webpublic/@{kind}/build.xml" 
     195           inheritrefs="true" target="deploy" /> 
     196 
     197      <!-- ======================= personal ================= --> 
     198      <ant antfile="${org.bedework.deployment.base}/webuser/@{kind}/build.xml" 
     199           inheritrefs="true" target="deploy" /> 
     200 
     201      <!-- ======================= caldav - public ================= --> 
     202      <ant antfile="${org.bedework.deployment.base}/publiccaldav/@{kind}/build.xml" 
     203           inheritrefs="true" target="deploy" /> 
     204 
     205      <!-- ======================= caldav - user ================= --> 
     206      <ant antfile="${org.bedework.deployment.base}/usercaldav/@{kind}/build.xml" 
     207           inheritrefs="true" target="deploy" /> 
     208 
     209      <!-- ======================= termination tasks ================= --> 
     210      <ant antfile="${org.bedework.deployment.base}/termination/@{kind}/build.xml" 
     211           inheritrefs="true" target="deploy" /> 
     212    </sequential> 
     213  </macrodef> 
    243214</project> 

  • trunk/calendar3/deployment/webadmin/copyprops.xml

    r2 r268  
    1414    <property name="propval.war.name" 
    1515              value="${org.bedework.webadmin.war.name}" /> 
     16 
    1617    <property name="propval.ear.name" 
    1718              value="${org.bedework.webadmin.ear.name}" /> 
    …… 
    6364              value="${app.personal.calendar.uri}" /> 
    6465 
    65     <property name="propval.portal.platform" 
    66               value="${org.bedework.admin.portal.platform}" /> 
    67  
    6866    <property name="propval.app.jetspeed2.admin.roles" 
    6967              value="${org.bedework.webadmin.app.jetspeed2.roles}" /> 

  • trunk/calendar3/deployment/webpublic/copyprops.xml

    r2 r268  
    6363    <property name="propval.app.personal.calendar.uri" 
    6464              value="${app.personal.calendar.uri}" /> 
    65  
    66     <property name="propval.portal.platform" 
    67               value="${org.bedework.admin.portal.platform}" /> 
    6865  </target> 
    6966</project> 

  • trunk/calendar3/deployment/webuser/copyprops.xml

    r2 r268  
    6363    <property name="propval.app.personal.calendar.uri" 
    6464              value="${app.personal.calendar.uri}" /> 
    65  
    66     <property name="propval.portal.platform" 
    67               value="${org.bedework.admin.portal.platform}" /> 
    6865  </target> 
    6966</project> 

  • trunk/calendar3/webadmin/war/WEB-INF/jboss-web.xml

    r2 r268  
    88    <jndi-name>java:/CalendarDS</jndi-name> 
    99  </resource-ref> 
    10  
    11   <!-- Used at rpi - should cause no problems elsewhere --> 
    12   <ejb-ref> 
    13     <ejb-ref-name>rpi/misc/creds</ejb-ref-name> 
    14     <jndi-name>@CREDSEJB-JNDI-NAME@</jndi-name> 
    15   </ejb-ref> 
    16  
    17   <ejb-ref> 
    18     <ejb-ref-name>rpi/diradmin</ejb-ref-name> 
    19     <jndi-name>@DIRADMINEJB-JNDI-NAME@</jndi-name> 
    20   </ejb-ref> 
    2110</jboss-web>