cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject cvs commit: cocoon-2.2 build.xml
Date Fri, 26 Dec 2003 10:32:24 GMT
unico       2003/12/26 02:32:24

  Modified:    tools/targets init-build.xml admin-build.xml
                        standalone-demo-build.xml ide-build.xml
                        samples-build.xml forrest-build.xml
                        instrumentation-build.xml dist-build.xml
                        docs-build.xml compile-build.xml test-build.xml
                        webapp-build.xml validate-build.xml
               .        build.xml
  Log:
  use <import> task instead of entities to include build files in order to be able to
use xml editors again
  
  Revision  Changes    Path
  1.3       +7 -3      cocoon-2.2/tools/targets/init-build.xml
  
  Index: init-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/init-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- init-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ init-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,4 +1,9 @@
  -<!-- === Initialization Targets ================================================ -->
  +<?xml version="1.0"?>
  +<project name="init">
  +
  +  <description>
  +    Initialization Targets
  +  </description>
   
     <target name="init">
   
  @@ -186,6 +191,5 @@
     <target name="clean-standalone-demo" depends="init" description="Cleans the standalone-demo">
       <delete dir="${build.standalone.demo}"/>
     </target>
  -
  -
  +</project>
   
  
  
  
  1.3       +9 -2      cocoon-2.2/tools/targets/admin-build.xml
  
  Index: admin-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/admin-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- admin-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ admin-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,5 +1,10 @@
  -<!-- === Admin targets ===================================================== -->
  -
  +<?xml version="1.0"?>
  +<project name="admin">
  +  
  +  <description>
  +    Admin targets
  +  </description>
  +  
     <!-- Creates the web site  -->
     <target name="site" depends="forrest, javadocs" description="[admin] Builds the site">
       <mkdir dir="${site}"/>
  @@ -24,3 +29,5 @@
   
     <!-- compiles and packages the core classes and the deprecated classes -->
     <target name="gump-core" depends="package-core, package-deprecated, javadocs, validate-jars,
junit-tests"/>
  +  
  +</project>
  \ No newline at end of file
  
  
  
  1.2       +4 -1      cocoon-2.2/tools/targets/standalone-demo-build.xml
  
  Index: standalone-demo-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/standalone-demo-build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- standalone-demo-build.xml	18 Nov 2003 18:56:12 -0000	1.1
  +++ standalone-demo-build.xml	26 Dec 2003 10:32:24 -0000	1.2
  @@ -1,3 +1,5 @@
  +<?xml version="1.0"?>
  +<project name="standalone">
   <!--
       ant include file for "standalone-demo" build
       @author bdelacretaz@codeconsult.ch
  @@ -60,3 +62,4 @@
       <echo>--------------------------------------------------------------------------</echo>
   
   </target>
  +</project>
  \ No newline at end of file
  
  
  
  1.4       +8 -2      cocoon-2.2/tools/targets/ide-build.xml
  
  Index: ide-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/ide-build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ide-build.xml	25 Dec 2003 15:45:37 -0000	1.3
  +++ ide-build.xml	26 Dec 2003 10:32:24 -0000	1.4
  @@ -1,5 +1,10 @@
  -<!-- === IDE targets =========================================================== -->
  -
  +<?xml version="1.0"?>
  +<project name="ide">
  +  
  +  <description>
  +    IDE targets
  +  </description>
  +  
     <!-- Generate the Emacs JDE project file -->
     <target name="emacs-project" depends="prepare" description="Generate the Emacs project
files">
       <path id="jar.files">
  @@ -124,3 +129,4 @@
             <fileset dir="${build.webapp}/WEB-INF/lib" includes="*.jar"/>
         </delete>
     </target>
  +</project>
  \ No newline at end of file
  
  
  
  1.3       +7 -2      cocoon-2.2/tools/targets/samples-build.xml
  
  Index: samples-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/samples-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- samples-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ samples-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,4 +1,9 @@
  -<!-- === Samples Targets ======================================================= -->
  +<?xml version="1.0"?>
  +<project name="samples">
  +
  +  <description>
  +    Samples Targets
  +  </description>
   
     <target name="samples" depends="prepare" unless="unless.exclude.webapp.samples">
       <mkdir dir="${build.samples}"/>
  @@ -45,5 +50,5 @@
               srcdir="${webapp.samples}" 
               includes="**/*.xwelcome"/>
     </target>
  -
  +</project>
     
  
  
  
  1.2       +7 -2      cocoon-2.2/tools/targets/forrest-build.xml
  
  Index: forrest-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/forrest-build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest-build.xml	18 Nov 2003 18:56:12 -0000	1.1
  +++ forrest-build.xml	26 Dec 2003 10:32:24 -0000	1.2
  @@ -1,4 +1,9 @@
  -<!-- === Forrest Targets ================================================= -->
  +<?xml version="1.0"?>
  +<project name="forrest">
  +
  +  <description>
  +    Forrest Targets
  +  </description>
   
     <target name="forrest" depends="prepare, prepare-docs, forrest.init, validate-jars,
javadocs" description="Generates static HTML documentation">
       <!-- Add some other documents -->
  @@ -149,4 +154,4 @@
       </echo>
       <fail message="Need to define $${forrest.home}"/>
     </target>
  -
  +</project>
  
  
  
  1.2       +4 -1      cocoon-2.2/tools/targets/instrumentation-build.xml
  
  Index: instrumentation-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/instrumentation-build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- instrumentation-build.xml	18 Nov 2003 18:56:12 -0000	1.1
  +++ instrumentation-build.xml	26 Dec 2003 10:32:24 -0000	1.2
  @@ -1,4 +1,6 @@
  -  <target name="start-instrumentation-client" depends="init">
  +<?xml version="1.0"?>
  +<project name="instrumentation">
  +    <target name="start-instrumentation-client" depends="init">
       <property name="lib.instrumentation" value="tools/instrumentation/lib"/>
   
       <echo message="The version of the altrmi server libraries in ${lib.optional} must
correspond"/>
  @@ -20,3 +22,4 @@
         </classpath>
       </java>
     </target>
  +</project>
  \ No newline at end of file
  
  
  
  1.2       +7 -1      cocoon-2.2/tools/targets/dist-build.xml
  
  Index: dist-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/dist-build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dist-build.xml	18 Nov 2003 18:56:12 -0000	1.1
  +++ dist-build.xml	26 Dec 2003 10:32:24 -0000	1.2
  @@ -1,4 +1,9 @@
  -<!-- === Distribution targets ============================================== -->
  +<?xml version="1.0"?>
  +<project name="dist">
  +
  +  <description>
  +    Distribution targets
  +  </description>
   
     <target name="dist" depends="init" description="[admin] Builds the distribution">
   
  @@ -83,3 +88,4 @@
       <delete file="${dist.target}/${dist.name}-src.zip"/>
       <delete dir="${dist.root}"/>
     </target>  
  +</project>
  \ No newline at end of file
  
  
  
  1.3       +8 -2      cocoon-2.2/tools/targets/docs-build.xml
  
  Index: docs-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/docs-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- docs-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ docs-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,5 +1,10 @@
  -<!-- === Documentation Targets ================================================= -->
  +<?xml version="1.0"?>
  +<project name="docs">
   
  +  <description>
  +    Documentation Targets
  +  </description>
  +  
     <target name="prepare-docs">
   
       <!-- Set classpath for documentation -->
  @@ -195,4 +200,5 @@
     <target name="javadocs" 
             description="Builds the API documentation (javadocs)">
     </target>
  -
  +  
  +</project>
  
  
  
  1.3       +7 -2      cocoon-2.2/tools/targets/compile-build.xml
  
  Index: compile-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/compile-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- compile-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ compile-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,5 +1,10 @@
  -<!-- === Compilation Targets =================================================== -->
  +<?xml version="1.0"?>
  +<project name="compile">
   
  +  <description>
  +    Compilation Targets
  +  </description>
  +  
     <!-- compiles everything -->
     <target name="compile" depends="compile-core, compile-deprecated, compile-tests"/>
   
  @@ -131,4 +136,4 @@
         </fileset>
       </jar>
     </target>
  -
  +</project>
  
  
  
  1.3       +7 -2      cocoon-2.2/tools/targets/test-build.xml
  
  Index: test-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/test-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ test-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,4 +1,9 @@
  -<!-- === Test targets =========================================================== -->
  +<?xml version="1.0"?>
  +<project name="test">
  +
  +  <description>
  +    Test targets
  +  </description>
   
     <!-- Runs all tests -->
     <target name="test" depends="junit-tests" description="Runs all tests"/>
  @@ -45,4 +50,4 @@
         <arg line="-f ${build.test}/anteater/all-tests.xml -Dhost=${host} -Dport=${port}
-Dbase=${base}"/>
       </java>
     </target>
  -
  +</project>
  
  
  
  1.4       +7 -2      cocoon-2.2/tools/targets/webapp-build.xml
  
  Index: webapp-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/webapp-build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- webapp-build.xml	25 Dec 2003 15:45:37 -0000	1.3
  +++ webapp-build.xml	26 Dec 2003 10:32:24 -0000	1.4
  @@ -1,4 +1,9 @@
  -<!-- === Webapp targets ==================================================== -->
  +<?xml version="1.0"?>
  +<project name="webapp">
  +
  +  <description>
  +    Webapp targets
  +  </description>
   
     <target name="prepare-webapp" depends="package">
       <mkdir dir="${build.webapp}"/>
  @@ -147,4 +152,4 @@
          <include name="${customconf}/*.xweb" />
       </xpatch>
     </target>
  -
  +</project>
  
  
  
  1.3       +7 -2      cocoon-2.2/tools/targets/validate-build.xml
  
  Index: validate-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/tools/targets/validate-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- validate-build.xml	25 Dec 2003 15:45:37 -0000	1.2
  +++ validate-build.xml	26 Dec 2003 10:32:24 -0000	1.3
  @@ -1,4 +1,9 @@
  -<!-- === Validation targets ==================================================== -->
  +<?xml version="1.0"?>
  +<project name="validation">
  +
  +  <description>
  +    Validation targets
  +  </description>
   
     <!-- Check if all the JAR files are properly declared in lib/jars.xml    -->
     <target name="validate-jars" depends="prepare" unless="exclude.validate.jars">
  @@ -99,4 +104,4 @@
         <fileset dir="${build.context}/stylesheets" includes="**/*.xsl"/>
       </jing>-->
     </target>
  -
  +</project>
  \ No newline at end of file
  
  
  
  1.34      +27 -36    cocoon-2.2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/build.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- build.xml	18 Nov 2003 18:56:12 -0000	1.33
  +++ build.xml	26 Dec 2003 10:32:24 -0000	1.34
  @@ -1,5 +1,4 @@
   <?xml version="1.0"?>
  -<!DOCTYPE project [
   <!-- ===========================================================================
   
                          * =========================== *
  @@ -10,61 +9,53 @@
   
   ============================================================================ -->
   
  -  <!-- ==================  Apache Cocoon targets  ======================== --> 
  -  <!ENTITY init-targets            SYSTEM "tools/targets/init-build.xml"> 
  -  <!ENTITY compile-targets         SYSTEM "tools/targets/compile-build.xml"> 
  -  <!ENTITY validate-targets        SYSTEM "tools/targets/validate-build.xml"> 
  -  <!ENTITY samples-targets         SYSTEM "tools/targets/samples-build.xml"> 
  -  <!ENTITY webapp-targets          SYSTEM "tools/targets/webapp-build.xml"> 
  -  <!ENTITY ide-targets             SYSTEM "tools/targets/ide-build.xml"> 
  -  <!ENTITY test-targets            SYSTEM "tools/targets/test-build.xml"> 
  -  <!ENTITY docs-targets            SYSTEM "tools/targets/docs-build.xml">
  -  <!ENTITY dist-targets            SYSTEM "tools/targets/dist-build.xml">
  -  <!ENTITY admin-targets           SYSTEM "tools/targets/admin-build.xml">
  -  <!ENTITY standalone-demo-targets SYSTEM "tools/targets/standalone-demo-build.xml">
  -  <!ENTITY instrumentation-targets SYSTEM "tools/targets/instrumentation-build.xml">
  -  <!-- =================================================================== -->
  -
  -  <!-- ==================  Apache Forrest targets  ======================= -->
  -  <!ENTITY forrest-targets         SYSTEM "tools/targets/forrest-build.xml">
  -  <!-- =================================================================== -->
  -
  -]>
  -
   <project default="webapp" basedir="." name="Apache Cocoon">
   
     <!-- ==================  Apache Cocoon targets  ======================== -->
   
     <!-- =================================================================== -->
  -  <!-- Initialization targets  -->  &init-targets;
  +  <!-- Initialization targets  -->
  +  <import file="tools/targets/init-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Compile targets         -->  &compile-targets;
  +  <!-- Compile targets         -->
  +  <import file="tools/targets/compile-build.xml" />
     <!-- =================================================================== -->  
  -  <!-- Validation targets      -->  &validate-targets;
  +  <!-- Validation targets      -->
  +  <import file="tools/targets/validate-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Samples targets         -->  &samples-targets;
  +  <!-- Samples targets         -->
  +  <import file="tools/targets/samples-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Web application targets -->  &webapp-targets;
  +  <!-- Web application targets -->
  +  <import file="tools/targets/webapp-build.xml" />
     <!-- =================================================================== -->
  -  <!-- IDE targets             -->  &ide-targets;
  +  <!-- IDE targets             -->
  +  <import file="tools/targets/ide-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Testcases targets       -->  &test-targets;
  +  <!-- Testcases targets       -->
  +  <import file="tools/targets/test-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Documentation targets   -->  &docs-targets;
  +  <!-- Documentation targets   -->
  +  <import file="tools/targets/docs-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Distribution targets    -->  &dist-targets;
  +  <!-- Distribution targets    -->
  +  <import file="tools/targets/dist-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Administration targets  -->  &admin-targets;
  +  <!-- Administration targets  -->
  +  <import file="tools/targets/admin-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Standalone-demo targets -->  &standalone-demo-targets;
  +  <!-- Standalone-demo targets -->
  +  <import file="tools/targets/standalone-demo-build.xml" />
     <!-- =================================================================== -->
  -  <!-- Instrumentation targets -->  &instrumentation-targets;
  +  <!-- Instrumentation targets -->
  +  <import file="tools/targets/instrumentation-build.xml" />
     <!-- =================================================================== -->
   
     <!-- ==================  Apache Forrest targets  ======================= -->
   
     <!-- =================================================================== -->
  -  <!-- Forrest targets         -->  &forrest-targets;
  +  <!-- Forrest targets         -->
  +  <import file="tools/targets/forrest-build.xml" />
     <!-- =================================================================== -->
   
   </project>
  
  
  

Mime
View raw message