ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/tools/lib LICENSE.jdepend.txt checkstyle-all-2.1.jar jdepend-2.2.jar
Date Sun, 07 Apr 2002 06:56:00 GMT
adammurdoch    02/04/06 22:56:00

  Modified:    proposal/myrmidon antlib.xml build.xml
  Added:       proposal/myrmidon/lib/bin/lib excalibur-cli-1.0.jar
               proposal/myrmidon/lib/ext excalibur-bzip2-1.0a.jar
                        excalibur-tar-1.0a.jar excalibur-zip-1.0a.jar
               proposal/myrmidon/src/manifest archive-manifest.mf
               proposal/myrmidon/tools/lib LICENSE.jdepend.txt
                        checkstyle-all-2.1.jar jdepend-2.2.jar
  Removed:     proposal/myrmidon/lib LICENSE.jdepend.txt
                        checkstyle-all-2.1.jar excalibur-bzip2-1.0a.jar
                        excalibur-cli-1.0.jar excalibur-tar-1.0a.jar
                        excalibur-zip-1.0a.jar jdepend-2.2.jar
  Log:
  * Moved a bunch of Jars around in CVS.
  * Moved a bunch of Jars around in dist image:
     excalibur-cli-*.jar -> dist/bin/lib
     excalibur-bzip2-*.jar -> dist/ext
     excalibur-tar-*.jar -> dist/ext
     excalibur-zip-*.jar -> dist/ext
  * Added dependency on 'excalibur-bzip2' to archive 'antlib'.
  
  Revision  Changes    Path
  1.11      +2 -3      jakarta-ant/proposal/myrmidon/antlib.xml
  
  Index: antlib.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/antlib.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- antlib.xml	28 Mar 2002 11:56:44 -0000	1.10
  +++ antlib.xml	7 Apr 2002 06:55:59 -0000	1.11
  @@ -37,9 +37,8 @@
           <pathelement location="../../lib/optional/junit.jar" />
           <pathelement location="../xdocs/lib/xdoclet.jar" />
           <pathelement location="../xdocs/lib/log4j-core.jar" />
  -        <fileset dir="${lib.dir}">
  -            <include name="*.jar" />
  -        </fileset>
  +        <fileset dir="${lib.dir}" includes="**/*.jar"/>
  +        <fileset dir="tools/lib" includes="**/*.jar"/>
           <pathelement path="${build.classes}" />
           <pathelement path="${build.custom-tasks}" />
       </path>
  
  
  
  1.104     +18 -20    jakarta-ant/proposal/myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- build.xml	7 Apr 2002 02:27:55 -0000	1.103
  +++ build.xml	7 Apr 2002 06:55:59 -0000	1.104
  @@ -71,16 +71,17 @@
   
       <property name="constants.file" value="org/apache/myrmidon/Constants.java"/>
   
  +    <path id="tools.class.path">
  +        <fileset dir="tools/lib" includes="**/*.jar"/>
  +        <fileset dir="../xdocs/lib" includes="*.jar" />
  +    </path>
       <path id="project.class.path">
           <pathelement location="../../lib/optional/junit.jar" />
  -        <pathelement location="../xdocs/lib/xdoclet.jar" />
  -        <pathelement location="../xdocs/lib/log4j-core.jar" />
  -        <fileset dir="${lib.dir}">
  -            <include name="*.jar" />
  -        </fileset>
  +        <fileset dir="${lib.dir}" includes="**/*.jar"/>
           <pathelement location="${build.classes}"/>
           <!-- Need this to get tools.jar in the classpath -->
           <pathelement path="${java.class.path}"/>
  +        <path refid="tools.class.path"/>
       </path>
   
       <!-- Main target -->
  @@ -205,7 +206,7 @@
           <property name="custom-package-dir" value="${build.custom-tasks}/org/apache/myrmidon/build"/>
           <mkdir dir="${build.custom-tasks}"/>
           <javac srcdir="src/make" destdir="${build.custom-tasks}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="tools.class.path"/>
           </javac>
   
           <copy file="${manifest.dir}/ant-descriptor.j" todir="${custom-package-dir}"/>
  @@ -220,7 +221,7 @@
               classname="org.apache.myrmidon.build.AntlibDescriptorTask">
               <classpath>
                   <pathelement location="${build.custom-tasks}"/>
  -                <path refid="project.class.path"/>
  +                <path refid="tools.class.path"/>
               </classpath>
           </taskdef>
       </target>
  @@ -558,6 +559,7 @@
               <classpath>
                 <pathelement location="${build.classes}"/>
                 <path refid="project.class.path"/>
  +              <path refid="tools.class.path"/>
               </classpath>
   
               <exclude name="**/SmbFileSystemTestCase.java" unless="jcifs.present"/>
  @@ -659,8 +661,9 @@
   
           <!-- Prepare the project tests -->
           <antlib-descriptor libName="unittests"
  -            destdir="${gen.dir}"
  -            classpathref="project.class.path">
  +            destdir="${gen.dir}">
  +            <classpath refid="project.class.path"/>
  +            <classpath refid="tools.class.path"/>
               <fileset dir="src/test">
                   <include name="org/apache/antlib/**"/>
                   <include name="org/apache/myrmidon/framework/**"/>
  @@ -716,7 +719,7 @@
           <!-- thats why you are required to define do.checkstyle property to generate
the report -->
           <taskdef name="checkstyle"
               classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="tools.class.path"/>
           </taskdef>
           <checkstyle
               lcurlyType="nl"
  @@ -767,7 +770,7 @@
   
           <!-- this invocation of jdepend requires the CVS version of ant for the xml
format -->
           <jdepend outputfile="${build.dir}/jdepend-results.xml" format="xml" fork="yes">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="tools.class.path"/>
               <sourcespath>
                   <path refid="java.src" />
               </sourcespath>
  @@ -824,24 +827,19 @@
   
           <copy todir="${dist.bin}">
               <fileset dir="${build.bin}"/>
  +            <fileset dir="${lib.dir}/bin"/>
           </copy>
   
           <copy todir="${dist.lib}">
               <fileset dir="${build.lib}"/>
  +            <fileset dir="${lib.dir}" includes="*.jar, *.zip"/>
  +            <fileset dir="../../lib/optional" includes="junit.jar" />
           </copy>
   
           <copy todir="${dist.ext}">
               <fileset dir="${build.ext}"/>
  +            <fileset dir="${lib.dir}/ext"/>
           </copy>
  -
  -        <copy todir="${dist.lib}">
  -            <fileset dir="${lib.dir}">
  -                <exclude name="xdoclet.jar"/>
  -                <exclude name="jdepend.jar"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${dist.lib}" file="../../lib/optional/junit.jar" />
   
           <copy todir="${dist.bin}">
               <fileset dir="${script.dir}"/>
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/lib/bin/lib/excalibur-cli-1.0.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant/proposal/myrmidon/lib/ext/excalibur-bzip2-1.0a.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant/proposal/myrmidon/lib/ext/excalibur-tar-1.0a.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant/proposal/myrmidon/lib/ext/excalibur-zip-1.0a.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/manifest/archive-manifest.mf
  
  Index: archive-manifest.mf
  ===================================================================
  Manifest-Version: 1.0
  Extension-List: bzip2
  bzip2-Extension-Name: excalibur-bzip2
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/tools/lib/LICENSE.jdepend.txt
  
  Index: LICENSE.jdepend.txt
  ===================================================================
  Copyright (C) 2001 Clarkware Consulting, Inc.
  All Rights Reserved.
  
  Redistribution and use in source and binary forms, with or without 
  modification, are permitted provided that the following conditions 
  are met:
  
     1. Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
  
     2. Redistributions in binary form must reproduce the above copyright 
        notice, this list of conditions and the following disclaimer in the 
        documentation and/or other materials provided with the distribution.
  
     3. Neither the name of Clarkware Consulting, Inc. nor the names of its 
        contributors may be used to endorse or promote products derived 
        from this software without prior written permission. For written 
        permission, please contact clarkware@clarkware.com.
  
  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
  CLARKWARE CONSULTING OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
  OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
  NEGLIGENCE OR OTHERWISE) ARISING IN  ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/tools/lib/checkstyle-all-2.1.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant/proposal/myrmidon/tools/lib/jdepend-2.2.jar
  
  	<<Binary file>>
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message