Return-Path: 
 <cocoon-cvs-return-4340-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 41258 invoked by uid 500); 12 Dec 2001 23:30:41 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 41248 invoked by uid 500); 12 Dec 2001 23:30:41 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 12 Dec 2001 23:30:40 -0000
Message-ID: <20011212233040.86458.qmail@icarus.apache.org>
From: rubys@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/bin/src ClassAvailable.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

rubys       01/12/12 15:30:40

  Modified:    .        build.xml
               bin/src  ClassAvailable.java
  Removed:     bin/anttasks ClassAvailable.class SitemapTool.class
  Log:
  Make <ClassAvailable> respect the value of ${build.sysclasspath}.  See
  http://jakarta.apache.org/ant/manual/sysclasspath.html for details.
  Default to "ignore", leaving the original functionallity intact.
  For more details, see http://jakarta.apache.org/gump/why.html
  
  Update the build script to include the task definitions themselves as
  a part of the build.
  
  Revision  Changes    Path
  1.119     +12 -7     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- build.xml	2001/12/12 07:33:09	1.118
  +++ build.xml	2001/12/12 23:30:40	1.119
  @@ -102,12 +102,6 @@
   
   <project default="package" basedir=".">
   
  -  <!-- A simple task to test for a class -->
  -  <taskdef name="ClassAvailable" classname="ClassAvailable" classpath="./bin/anttasks"/>
  -  <!-- A task to change the sitemap. It is used to add optional components -->
  -  <taskdef name="SitemapTool" classname="SitemapTool" classpath="./bin/anttasks"/>
  -
  -
     <!--
       Give user a chance to override without editing this file
       (and without typing -D each time he compiles it)
  @@ -132,7 +126,6 @@
       <fileset dir="./lib">
         <include name="*.jar"/>
       </fileset>
  -    <pathelement path="${java.class.path}" />
     </path>
   
     <path id="scratchpad.classpath">
  @@ -233,6 +226,10 @@
       <filter token="database-user" value="${database-user}"/>
       <filter token="database-password" value="${database-password}"/>
   
  +    <!-- compile the ant tasks -->
  +    <mkdir dir="bin/anttasks"/>
  +    <javac srcdir="bin/src" destdir="bin/anttasks"/>
  +
     </target>
   
     <!-- =================================================================== -->
  @@ -248,6 +245,10 @@
         <classpath refid="classpath"/>
       </available>
   
  +    <!-- A simple task to test for a class -->
  +    <taskdef name="ClassAvailable" classname="ClassAvailable" 
  +        classpath="./bin/anttasks"/>
  +
       <ClassAvailable classpathref="classpath" 
                       property="xmldb.present" 
                       classname="org.xmldb.api.DatabaseManager"/>
  @@ -844,6 +845,10 @@
     <!-- Prepares the webapp directories                                     -->
     <!-- =================================================================== -->
     <target name="prepare-webapp" depends="copy-webapp">
  +      <!-- A task to change the sitemap. It is used to add optional components -->
  +      <taskdef name="SitemapTool" classname="SitemapTool" 
  +          classpath="./bin/anttasks"/>
  +
         <!-- Invoke the SitemapTool to add optional entries -->
         <SitemapTool directory="${build.src}"
                      extension="sitemap"
  
  
  
  1.4       +2 -0      xml-cocoon2/bin/src/ClassAvailable.java
  
  Index: ClassAvailable.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/bin/src/ClassAvailable.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassAvailable.java	2001/10/12 13:04:03	1.3
  +++ ClassAvailable.java	2001/12/12 23:30:40	1.4
  @@ -19,6 +19,7 @@
    * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    *
    * This task searches only in the defined path but not in the parents path
  + * unless explicitly overridden by the value of ${build.sysclasspath}
    * like the original available task does.
    * @author Carsten Ziegeler <a href="mailto:cziegeler@apache.org">cziegeler@apache.org</a>
    */
  @@ -81,6 +82,7 @@
   
           if (classpath != null) {
               classpath.setProject(project);
  +            classpath = classpath.concatSystemClasspath("ignore");
           }
   
           if (!findClassInComponents(classname)) {
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org