You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/01/12 17:53:10 UTC

cvs commit: cocoon-lenya/src/targets test-build.xml webapp-build.xml

andreas     2004/01/12 08:53:10

  Modified:    .        build.xml
               src/targets test-build.xml webapp-build.xml
  Log:
  added publication test framework
  
  Revision  Changes    Path
  1.60      +4 -1      cocoon-lenya/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	26 Sep 2003 11:23:32 -0000	1.59
  +++ build.xml	12 Jan 2004 16:53:10 -0000	1.60
  @@ -31,6 +31,7 @@
     <!ENTITY dist-targets        SYSTEM "./src/targets/dist-build.xml">
     <!ENTITY export-targets      SYSTEM "./src/targets/export-build.xml">
     <!ENTITY publication-targets SYSTEM "./src/targets/publication-build.xml">
  +  <!ENTITY publication-tests   SYSTEM "./src/targets/publication-test-build.xml">
     <!-- =================================================================== -->
   
   ]>
  @@ -59,6 +60,8 @@
     <!-- Export targets          -->  &export-targets;
     <!-- =================================================================== -->
     <!-- Publication targets     -->  &publication-targets;
  +  <!-- =================================================================== -->
  +  <!-- Publication tests       -->  &publication-tests;
     <!-- =================================================================== -->
   
   </project>
  
  
  
  1.17      +5 -3      cocoon-lenya/src/targets/test-build.xml
  
  Index: test-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/targets/test-build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- test-build.xml	18 Dec 2003 16:02:19 -0000	1.16
  +++ test-build.xml	12 Jan 2004 16:53:10 -0000	1.17
  @@ -32,7 +32,7 @@
     </target>
     
     <!-- prepares the tests. -->
  -  <target name="tests.prepare">
  +  <target name="tests.prepare" depends="build-custom-tasks">
       <mkdir dir="${build.test}"/>
   
       <!-- Copy test files to build test dir -->
  @@ -40,6 +40,8 @@
         <fileset dir="${src.test}" excludes="**/*.java"/>
       </copy>
   
  +    <copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="java/test" builddir="${src.test}" />
  +
       <!-- Compile tests -->
       <javac srcdir="${src.test}"
              destdir="${build.test}"
  @@ -65,8 +67,8 @@
     			test.creator,
     			test.publisher,
     			test.accesscontrol,
  -			test.deactivate,
  -  			test.publication"
  +        test.deactivate,
  +        test.publications"
     />
   
     
  
  
  
  1.11      +7 -0      cocoon-lenya/src/targets/webapp-build.xml
  
  Index: webapp-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/targets/webapp-build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- webapp-build.xml	18 Dec 2003 16:02:19 -0000	1.10
  +++ webapp-build.xml	12 Jan 2004 16:53:10 -0000	1.11
  @@ -36,6 +36,13 @@
               includes="*/config/cocoon.xconf"
               addComments="true"/>
               
  +    <!-- Patch publication tests -->
  +    <echo>INFO: Patch publication tests</echo>
  +    <xpatch file="./src/targets/publication-test-build.xml"
  +            srcdir="${build.webapp}/lenya/pubs" 
  +            includes="*/targets/test-build.xconf"
  +            addComments="true"/>
  +            
       <!-- create directory classes within webapp -->
       <mkdir dir="${build.webapp}/WEB-INF/classes"/>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org