forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest build.xml forrest.build.xml status.xml
Date Wed, 16 Oct 2002 07:27:16 GMT
jefft       2002/10/16 00:27:16

  Modified:    .        build.xml forrest.build.xml status.xml
  Log:
  Fix some JDK 1.4 build problems
  
  Revision  Changes    Path
  1.28      +9 -86     xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.xml	13 Oct 2002 15:50:16 -0000	1.27
  +++ build.xml	16 Oct 2002 07:27:16 -0000	1.28
  @@ -232,8 +232,10 @@
       </copy>
   
       <mkdir dir="${webapp.webinf.dir}/lib"/>
  -    <copy todir="${webapp.webinf.dir}/lib">
  -      <fileset dir="./lib/endorsed"    />
  +	<copy todir="${webapp.webinf.dir}/lib">
  +		<!--
  +		<fileset dir="./lib/endorsed"    />
  +		-->
         <fileset dir="./lib/core"/>
         <fileset dir="./lib/optional"/>
         <fileset dir="./src/scratchpad/lib"/>
  @@ -313,6 +315,11 @@
         <fileset dir="${webapp.webinf.dir}" />
       </copy>
   
  +	<mkdir dir="${dist-shbat.dir}/lib/endorsed" />
  +	<copy todir="${dist-shbat.dir}/lib/endorsed">
  +		<fileset dir="lib/endorsed" />
  +    </copy>
  +
       <!-- copy the bare-context dir as needed by the cocoon CLI -->
       <mkdir dir="${dist-shbat.dir}/context" />
       <copy todir="${dist-shbat.dir}/context">
  @@ -453,89 +460,5 @@
     -->
   
       &import-antipede;
  -
  -  <!-- ================================== -->
  -  <!--    Targets for the remote builds   -->
  -  <!-- ================================== -->
  -
  -  <target name="bot.init" depends="init">
  -    <!-- initializes environment to start on bot targets -->
  -    <property name="bot.build.dir"              value="${xlayout.build.bot.dir}"/>
  -    <property name="bot.work.build.xml"         value="${bot.build.dir}/work.build.xml"/>
  -    <property name="bot.default.parameters.xml" value="${bot.build.dir}/default.parameters.xml"/>
  -    <property name="bot.forrestbot.xconf"       value="forrestbot.conf.xml" />
  -    <property file="ant-mail.properties" />
  -    <property name="bot.templates.build.xml"    value="${xlayout.source.resources.forrestbot.ant.dir}/templates.build.xml"
/>
  -    <property name="bot.work.builder.xslt"      value="${xlayout.source.resources.forrestbot.xslt.dir}/config2work.xsl"
/>
  -    <property name="bot.default.builder.xslt"   value="${xlayout.source.resources.forrestbot.xslt.dir}/config2defaults.xsl"
/>
  -    <mkdir dir="${bot.build.dir}" />
  -    <echo message="Using config file: ${bot.forrestbot.xconf}" />
  -  </target>
  -
  -  <target name="bot.conf2build" depends="bot.init" >
  -    <!-- remove previous versions to force generation again -->
  -    <delete file="${bot.work.build.xml}" />
  -    <delete file="${bot.default.parameters.xml}" />
  -
  -    <!-- builds the different xml files this process needs.  -->
  -    <style in="${bot.forrestbot.xconf}"
  -       out="${bot.work.build.xml}"
  -       style="${bot.work.builder.xslt}"/>
  -    <style in="${bot.forrestbot.xconf}"
  -       out="${bot.default.parameters.xml}"
  -       style="${bot.default.builder.xslt}"/>
  -    <copy todir="${bot.build.dir}" file="${bot.templates.build.xml}"/>
  -  </target>
  -
  -  <target name="bot.prepare-cp" depends="bot.init, compile" >
  -    <!-- todo: question if it is good practice to share WEB-INF classes -->
  -    <mkdir dir="${bot.build.dir}/WEB-INF/classes"/>
  -    <copy todir="${bot.build.dir}/WEB-INF/classes">
  -      <fileset dir="${resource.dir}/schema">
  -        <include name="CatalogManager.properties"/>
  -      </fileset>
  -      <fileset dir="${build.dest}">
  -        <include name="**/*.class"/>
  -      </fileset>
  -      <fileset dir="${build.scratchpad.dest}">
  -        <include name="**/*.class"/>
  -      </fileset>
  -    </copy>
  -
  -    <path id="forrest.cp">
  -      <path refid="classpath"/>
  -      <fileset dir="${build.dir}">
  -        <include name="*.jar"/>
  -      </fileset>
  -      <fileset dir="${tools.dir}">
  -        <include name="*/lib/*.jar"/>
  -      </fileset>
  -      <pathelement location="${tools.jar}"/>
  -      <pathelement location="${bot.build.dir}/WEB-INF/classes"/>
  -    </path>
  -  </target>
  -
  -  <target name="bot.run" depends="bot.conf2build, bot.prepare-cp" >
  -    <!-- delegates to the generated XML file -->
  -    <ant antfile="${bot.work.build.xml}" target="work" inheritRefs="true"/>
  -  </target>
  -
  -  <target name="bot" depends="bot.run" />
  -
  -  <!-- =================================================================== -->
  -  <!-- Import Ant-Centipede init targets - sets up basic build stuff       -->
  -  <!-- =================================================================== -->
  -  <!--
  -        This is the target that initializes tasks and properties used
  -        commonly in every other target.
  -
  -        Remember to add depends="init" to every target, so that this
  -        target is called before any other.
  -
  -        This target is internal; to make it unusable from the commandline,
  -        its name starts with a hyphen.
  -        To make it invisible when using -projecthelp, it lacks a description.
  -  -->
  -
   
   </project>
  
  
  
  1.13      +3 -0      xml-forrest/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/forrest.build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- forrest.build.xml	13 Oct 2002 15:50:16 -0000	1.12
  +++ forrest.build.xml	16 Oct 2002 07:27:16 -0000	1.13
  @@ -170,6 +170,7 @@
         <pathelement location="${project.ctxt-dir}/WEB-INF/classes"/>
         <fileset dir="${project.ctxt-dir}/WEB-INF/lib" includes="*.jar"/>
         <pathelement location="${forrest.home}/WEB-INF/classes"/>
  +      <fileset dir="${forrest.home}/lib/endorsed" includes="*.jar"/>
         <fileset dir="${forrest.home}/WEB-INF/lib" includes="*.jar" />
         <pathelement location="${tools.jar}"/>
       </path>
  @@ -422,6 +423,8 @@
             dir="." failonerror="true"
             classpathref="forrest.cp"
             >
  +      <jvmarg
  +        value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.home}/lib/endorsed"/>
         <arg value="-c${project.ctxt-dir}"/>   <!-- input to the process -->
         <arg value="-d${project.site-dir}"/>   <!-- output to be put -->
         <arg value="-w${project.work-dir}"/>   <!-- temp dir to use for e.g. cache
-->
  
  
  
  1.20      +5 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- status.xml	15 Oct 2002 10:54:04 -0000	1.19
  +++ status.xml	16 Oct 2002 07:27:16 -0000	1.20
  @@ -101,8 +101,13 @@
      </actions>
     </todo>
   
  +
  +
     <changes>
      <release version="0.1" date="2002">
  +    <action dev="JT" type="fix" context="shbat">
  +     Fixed ClassNotFoundException when running on JDK1.4.x
  +    </action>
       <action dev="JT" type="fix" context="schemas">
        Allow <code>xml:space='preserve'</code> attribute on &lt;p&gt;
element, which preserves
        space without the changed font and block display that &lt;code&gt; uses.
  
  
  

Mime
View raw message