Changeset 953

Show
Ignore:
Timestamp:
08/11/06 14:21:22
Author:
douglm
Message:

deploy of bedework now runs to completion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bedework/build/buildsh.xml

    r952 r953  
    1717<project name="uwcal.buildsh" default="build"> 
    1818  <target name="init"> 
     19    <!-- Load the location of the libraries --> 
     20    <property file="${org.bedework.project.bedework}/build/libjars.properties" /> 
     21 
    1922    <!-- Destinations - where we build stuff --> 
    2023    <property name="app.dest.home" 
    …… 
    7477 
    7578    <!-- core files --> 
    76     <copy todir="${app.dest.lib}" flatten="yes" > 
    77       <fileset dir="${org.bedework.temp.jars}"> 
    78         <include name="*.jar"/> 
     79 
     80    <copy todir="${app.dest.lib}" overwrite="yes"> 
     81      <fileset dir="${bin.home}"> 
     82        <!-- jars from sub-projects needed by all --> 
     83        <include name="rpiaccess*.jar"/> 
     84        <include name="rpiutil*.jar"/> 
     85        <include name="bw-davdefs*.jar"/> 
     86        <include name="bw-davio*.jar"/> 
     87 
     88        <!-- Calendar api jars --> 
     89        <include name="bw-calcore*.jar"/> 
     90        <include name="bw-calcorei*.jar"/> 
     91        <include name="bw-calenv*.jar"/> 
     92        <include name="bw-calfacade*.jar"/> 
     93        <include name="bw-calsvc*.jar"/> 
     94        <include name="bw-calsvci*.jar"/> 
     95        <include name="bw-icalendar*.jar"/> 
     96        <include name="bw-locale*.jar"/> 
     97        <include name="bw-logging*.jar"/> 
    7998      </fileset> 
    80       <fileset dir="${hibernate.jars.dir}"> 
    81         <include name="*.jar"/> 
    82       </fileset> 
    83       <fileset dir="${commons.dir}"> 
    84         <include name="*.jar"/> 
    85       </fileset> 
    86       <fileset dir="${struts.dir}"> 
    87         <include name="*.jar"/> 
    88       </fileset> 
     99    </copy> 
     100 
     101     <!-- any extra bin files--> 
     102    <copy todir="${app.dest.lib}" > 
     103      <fileset refid="app.bin.files" /> 
    89104    </copy> 
    90105 
    …… 
    94109    <copy todir="${app.dest.lib}" file="${commons-httpclient.jar}"/> 
    95110 
    96     <!-- associated projects --> 
    97     <copy todir="${app.dest.lib}" file="${org.bedework.access.jar}"/> 
    98     <copy todir="${app.dest.lib}" file="${org.bedework.rpiutil.jar}"/> 
    99     <copy todir="${app.dest.lib}" file="${org.bedework.davdefs.jar}" /> 
    100     <copy todir="${app.dest.lib}" file="${org.bedework.davio.jar}" /> 
    101  
    102111    <!-- Extra libraries specified in calling build file --> 
    103112    <copy todir="${app.dest.lib}" flatten="yes" > 
    …… 
    115124 
    116125    <copy todir="${app.dest.classes}"> 
    117       <fileset dir="${org.bedework.core.base}/resources/properties" /> 
     126      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
    118127      <filterset refid="property.filters" /> 
    119128    </copy> 
    120129 
    121130    <copy todir="${app.dest.classes}"> 
    122       <fileset dir="${org.bedework.core.base}/resources/hbms" /> 
     131      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
    123132      <filterset refid="property.filters" /> 
    124133    </copy> 

  • trunk/bedework/build/buildwar.xml

    r952 r953  
    306306        <!-- Common jars for web apps --> 
    307307        <include name="bw-appcommon*.jar"/> 
    308         <include name="bw-appcommon*.jar"/> 
    309         <include name="bw-appcommon*.jar"/> 
    310         <include name="bw-appcommon*.jar"/> 
    311         <include name="bw-appcommon*.jar"/> 
    312308      </fileset> 
    313309    </copy> 
    …… 
    333329    <copy todir="${app.dest.lib}" > 
    334330      <fileset refid="app.lib.files" /> 
    335       <fileset refid="app.temp.lib.files" /> 
     331      <!-- <fileset refid="app.temp.lib.files" /> --> 
    336332    </copy> 
    337333 

  • trunk/bedework/build/libjars.properties

    r952 r953  
    133133jetspeed2.jars.dir=jetspeed2-m3 
    134134 
     135# 
     136# Put you local jdbc file here or define this property in your bedework.build.properties 
     137# 
     138org.bedework.jdbc.lib=${org.bedework.default.lib}/jdbc 
     139 

  • trunk/bedework/deployment/dumprestore/shellscr/build.xml

    r952 r953  
    66 
    77<project name="bwdumpres.deploy" default="deploy" > 
    8   <import file="${org.bedework.bld.home}/deployment/deployprops.xml" /> 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    99 
    1010  <target name="init" > 
    1111    <dirname property="this.dir" file="${ant.file}"/> 
    1212 
    13     <property name="app.sou.dir" location="${org.bedework.project.dumprestore}" /> 
     13    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1414 
    1515    <property name="app.resources.dir" 
    …… 
    4444 
    4545    <!-- from the dist directory --> 
    46     <fileset id="org.bedework.run.jars" dir="${org.bedework.project.dumprestore}/dist" > 
    47       <include name="*.jar" /> 
     46    <fileset id="org.bedework.run.jars" dir="${org.bedework.empty.dir}" > 
    4847    </fileset> 
    4948 
    …… 
    5251 
    5352    <!-- from  the bin directory --> 
    54     <fileset id="org.bedework.run.bin.jars" dir="${bin.home}" > 
     53    <fileset id="app.bin.files" dir="${bin.home}" > 
    5554      <include name="bw-dumpres*.jar" /> 
    5655    </fileset> 
    …… 
    8584         =============================================================== --> 
    8685 
    87     <ant antfile="${org.bedework.buildsh}" inheritRefs="true" target="build" /> 
     86    <ant antfile="${buildsh}" inheritRefs="true" target="build" /> 
    8887  </target> 
    8988</project> 

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

    r952 r953  
    1515    <dirname property="this.dir" file="${ant.file}"/> 
    1616 
    17     <property name="app.sou.dir" location="${org.bedework.project.freebusy}/webclient" /> 
     17    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1818 
    1919    <!-- Flag as struts --> 

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

    r952 r953  
    1616    <dirname property="this.dir" file="${ant.file}"/> 
    1717 
    18     <property name="app.sou.dir" location="${org.bedework.project.caldav}/server" /> 
     18    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1919 
    2020    <!-- Properties that differ from the personal client --> 

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

    r952 r953  
    1515    <dirname property="this.dir" file="${ant.file}"/> 
    1616 
    17     <property name="app.sou.dir" location="${org.bedework.project.caldav}/server" /> 
     17    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1818 
    1919    <!-- Properties that differ from the personal client --> 

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

    r952 r953  
    1515    <dirname property="this.dir" file="${ant.file}"/> 
    1616 
    17     <property name="app.sou.dir" location="${org.bedework.webadmin.base}" /> 
     17    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1818 
    1919    <!-- Flag as struts --> 

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

    r952 r953  
    1515    <dirname property="this.dir" file="${ant.file}"/> 
    1616 
    17     <property name="app.sou.dir" location="${org.bedework.deploy.project.path}/${org.bedework.deploy.type}" /> 
     17    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1818 
    1919    <!-- Flag as struts --> 
    …… 
    7272    <fileset id="app.bin.files" dir="${bin.home}" > 
    7373      <include name="bw-webcommon*.jar" /> 
    74       <include name="bw-webcommon*.jar" /> 
    75     </fileset> 
    76  
    77     <!-- from  the temp jars directory --> 
    78     <fileset id="app.temp.lib.files" dir="${org.bedework.temp.jars}" > 
    79       <include name="${org.bedework.config.jar.name}" /> 
     74      <include name="bw-webconfig*.jar" /> 
    8075    </fileset> 
    8176 

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

    r952 r953  
    1515    <dirname property="this.dir" file="${ant.file}"/> 
    1616 
    17     <property name="app.sou.dir" location="${org.bedework.webclient.base}" /> 
     17    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1818 
    1919    <!-- Flag as struts --> 

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

    r952 r953  
    1515    <dirname property="this.dir" file="${ant.file}"/> 
    1616 
    17     <property name="app.sou.dir" location="${org.bedework.webclient.base}" /> 
     17    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
    1818 
    1919    <!-- Flag as struts --> 

  • trunk/bedework/deployutil/src/org/bedework/deployment/ForEachAppTask.java

    r952 r953  
    6969 * <li>prefix           Property name prefix for generated properties</li> 
    7070 * <li>appPrefix        Property name prefix for applications</li> 
    71  * <li>projectPrefix    Property name prefix for project locations</li> 
     71 * <li>projectPrefix    Property name prefix for project properties</li> 
    7272 * </ul> 
    7373 * 
    …… 
    192192        } 
    193193 
     194        String appSouProperty = appPrefix + name + ".sou.dir"; 
     195        String appSou = (String)props.getProperty(null, appSouProperty); 
     196 
     197        if (appSou == null) { 
     198          throw new BuildException("Property " + appSouProperty + 
     199                                   " is undefined"); 
     200        } 
     201 
     202        if (appSou.length() == 0) { 
     203          appSou = projectPath; 
     204        } else { 
     205          appSou = projectPath + "/" + appSou; 
     206        } 
     207 
    194208        props.setProperty(null, prefix + "name", name, false); 
    195209        props.setProperty(null, prefix + "projectName", project, false); 
    196210        props.setProperty(null, prefix + "project.path", projectPath, false); 
     211        props.setProperty(null, prefix + "app.sou", appSou, false); 
    197212        props.setProperty(null, prefix + "type", type, false); 
    198213        props.setProperty(null, prefix + "type.dir",