forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core forrest.build.xml
Date Sun, 25 Jan 2004 23:07:26 GMT
nicolaken    2004/01/25 15:07:26

  Modified:    .        build.xml status.xml
               src/core forrest.build.xml
  Log:
        <action dev="NKB" type="update" context="core">
          Libraries are not copied anymore in the servlet context of
          the dist and of the project being built; they are added
          instead to the classpath of jetty for the 'run' target and
          of the Cocoon CLI for the default 'site' target.
        </action>
  
  Revision  Changes    Path
  1.100     +2 -9      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- build.xml	21 Jan 2004 17:02:02 -0000	1.99
  +++ build.xml	25 Jan 2004 23:07:26 -0000	1.100
  @@ -220,7 +220,7 @@
     </target>
    
     <target name="refresh-code" depends="jar">
  -    <copy todir="${dist-shbat.dir}/context/WEB-INF/lib">
  +    <copy todir="${dist-shbat.dir}/lib/core">
         <fileset dir="${build.dir}" includes="*.jar"/>
       </copy>
     </target>
  @@ -232,7 +232,7 @@
       <delete dir="${dist-shbat.dir}" />
       <mkdir dir="${dist-shbat.dir}" />
       
  -    <!-- copy the prepared and wrapper stuff for the distribution -->
  +    <!-- copy the Forrest core -->
       <copy todir="${dist-shbat.dir}">
         <fileset dir="./src/core" />
       </copy>
  @@ -243,15 +243,8 @@
       </copy>
   
       <!-- Copy Forrest jars -->
  -    <!-- @TODO REDUCE COPYING -->
  -    <mkdir dir="${dist-shbat.dir}/context/WEB-INF/lib" />
  -  
       <antcall target="refresh-code"/>
       
  -    <copy todir="${dist-shbat.dir}/context/WEB-INF/lib">
  -      <fileset dir="./lib/core" includes="*.jar"/>
  -      <fileset dir="./lib/endorsed" includes="*.jar"/>
  -    </copy>
       <mkdir dir="${dist-shbat.dir}/lib" />
       <copy todir="${dist-shbat.dir}/lib">
         <!-- copy everything so that also dirs with no jars are there, as
  
  
  
  1.277     +7 -1      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.276
  retrieving revision 1.277
  diff -u -r1.276 -r1.277
  --- status.xml	21 Jan 2004 15:53:03 -0000	1.276
  +++ status.xml	25 Jan 2004 23:07:26 -0000	1.277
  @@ -29,6 +29,12 @@
   
     <changes>
       <release version="0.6-dev" date="unreleased">
  +      <action dev="NKB" type="update" context="core">
  +        Libraries are not copied anymore in the servlet context of
  +        the dist and of the project being built; they are added
  +        instead to the classpath of jetty for the 'run' target and
  +        of the Cocoon CLI for the default 'site' target.
  +      </action>
         <action dev="DB" type="add" context="build" fixes-bug="FOR-108">
           New 'clean-dist' target for build.xml, which is now the default target.
         </action>    
  
  
  
  1.22      +60 -59    xml-forrest/src/core/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- forrest.build.xml	23 Jan 2004 15:16:22 -0000	1.21
  +++ forrest.build.xml	25 Jan 2004 23:07:26 -0000	1.22
  @@ -25,7 +25,7 @@
     
     <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
       <classpath>
  -      <fileset dir="${forrest.home}/context/WEB-INF/lib" includes="jing*.jar" />
  +      <fileset dir="${forrest.home}/lib/core" includes="jing*.jar" />
       </classpath>
     </taskdef>
   
  @@ -252,13 +252,33 @@
     <target name="prepare-classpath" depends="prepare-context, -prepare-classpath"/>
     <target name="-prepare-classpath">
       <path id="forrest.cp">
  -      <pathelement location="${project.webapp}/WEB-INF/classes"/>
  -      <fileset dir="${project.webapp}/WEB-INF/lib" includes="*.jar"/>
  -      <pathelement location="${forrest.home}/context/WEB-INF/classes"/>
  -      <fileset dir="${forrest.home}/jetty" includes="servlet-2.3.jar"/>
  -      <fileset dir="${forrest.home}/lib/endorsed" includes="*.jar"/>
  -      <fileset dir="${forrest.home}/context/WEB-INF/lib" includes="*.jar" />
  -      <pathelement location="${tools.jar}"/>
  +         <pathelement path="${env.CLASSPATH}" />
  +         <pathelement location="${forrest.home}/context/WEB-INF/classes"/>
  +         <fileset dir="${forrest.home}/jetty">
  +           <include name="*.jar"/>
  +           <include name="*.JAR"/>
  +           <include name="*.zip"/>
  +           <include name="*.ZIP"/>
  +         </fileset>
  +         <fileset dir="${forrest.home}/lib/endorsed">
  +           <include name="*.jar"/>
  +           <include name="*.JAR"/>
  +           <include name="*.zip"/>
  +           <include name="*.ZIP"/>
  +         </fileset>         
  +         <fileset dir="${forrest.home}/lib/core">
  +           <include name="*.jar"/>
  +           <include name="*.JAR"/>
  +           <include name="*.zip"/>
  +           <include name="*.ZIP"/>
  +         </fileset>       
  +         <fileset dir="${forrest.home}/lib/optional">
  +           <include name="*.jar"/>
  +           <include name="*.JAR"/>
  +           <include name="*.zip"/>
  +           <include name="*.ZIP"/>
  +         </fileset>
  +         <pathelement location="${tools.jar}"/>
       </path>
     </target>
   
  @@ -324,8 +344,7 @@
          param: location to make temporary context-dir ${project.webapp} 
          =============================================================== -->
     <target name="project-context" depends="examine-proj, ensure-content,
  -    validate, init, bare-context, copy-sitemap, copy-conf, copy-lib, 
  -    copy-classes, copy-skinconf, copy-status"/>
  +    validate, init, bare-context, copy-sitemap, copy-conf, copy-skinconf, copy-status"/>
   
     <target name="copy-conf" if="conf.present">
       <copy toDir="${project.webapp}/WEB-INF" filtering="true"
  @@ -359,20 +378,6 @@
       </copy>
     </target>
   
  -  <target name="copy-lib" if="lib.present">
  -    <copy toDir="${project.webapp}/WEB-INF/lib" 
  -      overwrite="true" failonerror="false">
  -      <fileset dir="${lib-dir}"/>
  -    </copy>
  -  </target>
  -
  -  <target name="copy-classes" if="classes.present">
  -    <copy toDir="${project.webapp}/WEB-INF/classes" 
  -      overwrite="true" failonerror="false">
  -      <fileset dir="${classes-dir}"/>
  -    </copy>
  -  </target>
  -
     <target name="copy-skinconf" if="skinconf.present">
       <copy file="${skinconf}"
         toDir="${project.webapp}" 
  @@ -635,21 +640,6 @@
       <copy file="${forrest.home}/context/WEB-INF/web.xml" filtering="true" 
         todir="${project.webapp}/WEB-INF"/>
   
  -    <copy todir="${project.webapp}/WEB-INF">
  -      <!-- Note: no overwriting, so user's libs and classes get preference -->
  -      <fileset dir="${forrest.home}/context/WEB-INF">
  -        <include name="lib/**"/>
  -        <include name="classes/**"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
  -    <available property="jdk1.4+" classname="java.lang.CharSequence"/>
  -    <copy todir="${project.webapp}/WEB-INF/lib">
  -      <fileset dir="${forrest.home}/lib/endorsed">
  -        <include name="*jar" unless="jdk1.4+"/>
  -      </fileset>
  -    </copy>
       <!-- Prepare the Lucene search index -->
       <!-- FIXME: There must be a better way to configure this.
            Is this really a concern of the skinconf?
  @@ -678,6 +668,35 @@
     <target name="webapp" depends="webapp-local, copy-xdocs, copy-content"
      description="Generates a dynamic servlet-based website (an unpackaged webapp).">
      
  +   <!--
  +     Copy libs
  +   -->
  +    <copy toDir="${project.webapp}/WEB-INF/lib" 
  +      overwrite="true" failonerror="false">
  +      <fileset dir="${lib-dir}"/>
  +    </copy>
  +
  +    <copy toDir="${project.webapp}/WEB-INF/classes" 
  +      overwrite="true" failonerror="false">
  +      <fileset dir="${classes-dir}"/>
  +    </copy>
  +  
  +    <copy todir="${project.webapp}/WEB-INF">
  +    <!-- Note: no overwriting, so user's libs and classes get preference -->
  +      <fileset dir="${forrest.home}/context/WEB-INF">
  +        <include name="lib/**"/>
  +        <include name="classes/**"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
  +    <available property="jdk1.4+" classname="java.lang.CharSequence"/>
  +    <copy todir="${project.webapp}/WEB-INF/lib">
  +      <fileset dir="${forrest.home}/lib/endorsed">
  +        <include name="*jar" unless="jdk1.4+"/>
  +      </fileset>
  +    </copy>
  +       
      <!-- 
       | Copy all non-xdocs content across to the webapp
      -->
  @@ -1047,25 +1066,7 @@
             maxmemory="${forrest.maxmemory}"
             failonerror="yes">
          <classpath>
  -         <pathelement path="${env.CLASSPATH}" />
  -         <fileset dir="${forrest.home}/jetty">
  -           <include name="*.jar"/>
  -           <include name="*.JAR"/>
  -           <include name="*.zip"/>
  -           <include name="*.ZIP"/>
  -         </fileset>
  -         <fileset dir="${forrest.home}/lib/endorsed">
  -           <include name="*.jar"/>
  -           <include name="*.JAR"/>
  -           <include name="*.zip"/>
  -           <include name="*.ZIP"/>
  -         </fileset>         
  -         <fileset dir="${forrest.home}/lib/optional">
  -           <include name="*.jar"/>
  -           <include name="*.JAR"/>
  -           <include name="*.zip"/>
  -           <include name="*.ZIP"/>
  -         </fileset>
  +         <path refid="forrest.cp"/>
          </classpath>
          <jvmarg line="${forrest.jvmargs}"/>
          <jvmarg
  
  
  

Mime
View raw message