Changeset 3462

Show
Ignore:
Timestamp:
01/17/12 22:44:32
Author:
douglm
Message:

A whole bunch of changes that somehow got missed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.8/build/buildTools/deftasks.xml

    r3461 r3462  
    248248      </if> 
    249249 
    250       <buildfilters/> 
    251        
    252250      <import file="${build.dir}/buildTools/getJar.xml"/> 
    253251      <import file="${build.dir}/buildTools/jdoc.xml"/> 

  • releases/bedework-3.8/build/buildTools/getJar.xml

    r3461 r3462  
    6060          <mkdir dir="${bedework.home}/dist"/> 
    6161          <echoxml file="${bedework.home}/dist/jarlicenses.xml" append="true"> 
    62             <jar-license> 
     62            <jarLicense> 
    6363              <name>@{name}</name> 
    6464              <version>${org.bedework.license.version}</version> 
    …… 
    6767              <license>${org.bedework.license.license}</license> 
    6868              <from>${project.name}</from> 
    69             </jar-license> 
     69            </jarLicense> 
    7070          </echoxml> 
    7171        </then> 

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

    r3461 r3462  
    1717<project name="bw.buildsh" default="build"> 
    1818  <!--<import file="${build.dir}/buildfilters.xml" />--> 
    19  
     19  <buildfilters/> 
     20   
    2021  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    2122 

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

    r3461 r3462  
    4141 
    4242  <!--<import file="${build.dir}/buildfilters.xml" />--> 
    43  
     43  <buildfilters/> 
     44   
    4445  <if> 
    4546    <isset property="org.bedework.global.portal.platform" /> 

  • releases/bedework-3.8/build/quickstart/build.xml

    r3461 r3462  
    2727  <deftasks/> 
    2828 
    29   <!-- The only properties set below should be those directly used to 
    30        invoke the targets below, in this file. 
    31        Do not set properties here for tasks invoked in other build 
    32        files.  Instead, make sure the targets work in calendar/build.xml, 
    33        then invoke ant on the task in calendar/build.xml. 
    34  
    35        For an example, of invoking ant on another build file, 
    36        see the deploy target, below. 
    37     --> 
    3829 <target name="init" > 
    3930   <dirname property="quickstart.dir" file="${ant.file}"/> 
    …… 
    6455          description="Describe targets and their usage"> 
    6556    <echo level="info" message="As distributed the package should be ready to go."/> 
    66     <echo level="info" message="Ensure ant is on your path, (a version is in the" /> 
    67     <echo level="info" message="package)"/> 
    68     <echo level="info" message=""/> 
    69     <echo level="info" message="First in one window do"/> 
    70     <echo level="info" message="    ant hsqldb"/> 
    71     <echo level="info" message="This will start the hsqldb server ready for the "/> 
    72     <echo level="info" message="application."/> 
    73     <echo level="info" message=""/> 
    74     <echo level="info" message="In another window do"/> 
    75     <echo level="info" message="    ant tomcatstart"/> 
    76     <echo level="info" message=""/> 
    77     <echo level="info" message="Once tomcat is running you should be able to go to a"/> 
     57    <echo level="info" message=""/> 
     58    <echo level="info" message="cd into the quickstart then do"/> 
     59    <echo level="info" message="    ./startjboss"/> 
     60    <echo level="info" message=""/> 
     61    <echo level="info" message="Once jboss is running you should be able to go to a"/> 
    7862    <echo level="info" message="browser and connect to"/> 
    7963    <echo level="info" message="    http://localhost:8080/bedework"/> 
    8064    <echo level="info" message="and follow the instructions."/> 
    8165    <echo level="info" message=""/> 
    82     <echo level="info" message="To build the calendar do"/> 
     66    <echo level="info" message="To build and deploy bedework do"/> 
    8367    <echo level="info" message="    ./bw -quickstart deploy"/> 
    84     <echo level="info" message="which does a build and deploy of all components"/> 
     68    <echo level="info" message="which does a build and deploy of all calendar components"/> 
    8569    <echo level="info" message=""/> 
    8670    <echo level="info" message="See documentation in the docs directory or on bedework.org"/> 

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

    r3461 r3462  
    169169    <!-- ================= termination tasks for deployment ================ --> 
    170170 
    171     <!-- ensure has value --> 
    172     <property name="propval.app.cal.suite" value="" /> 
    173  
    174171    <ant antfile="${org.bedework.deployment.base}/termination/build.xml" 
    175172         inheritrefs="true" target="deploy" /> 
    …… 
    193190       ================================================================= --> 
    194191  <target name="build.configured.apps"> 
    195     <!-- Is this used any more? --> 
    196192    <forEachApp names="${org.bedework.install.app.names}" 
    197193                prefix="org.bedework.deploy" 
    …… 
    231227        <propertycopy name="propval.app.unauthenticated" 
    232228                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
    233         <!-- ensure has value --> 
    234         <property name="propval.app.cal.suite" value="" /> 
    235  
    236229        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    237230             inheritrefs="true" target="build.configured" > 
    …… 
    280273        <propertycopy name="propval.app.unauthenticated" 
    281274                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
    282         <!-- ensure has value --> 
    283         <property name="propval.app.cal.suite" value="" /> 
    284  
     275         
    285276        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    286277             inheritrefs="true" target="deploy" >