avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/etc project.mf
Date Thu, 10 Oct 2002 06:26:04 GMT
mcconnell    2002/10/09 23:26:04

  Modified:    assembly build.xml default.properties
               assembly/src/etc project.mf
  Removed:     assembly/lib excalibur-pool-1.0.jar excalibur-thread-1.0.jar
  Log:
  Updates to handle revisions to excalibur/event package.
  
  Revision  Changes    Path
  1.68      +8 -4      jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- build.xml	27 Sep 2002 11:13:32 -0000	1.67
  +++ build.xml	10 Oct 2002 06:26:04 -0000	1.68
  @@ -19,10 +19,11 @@
       <pathelement location="${excalibur-extension.jar}"/>
       <pathelement location="${excalibur-logger.jar}"/>
       <pathelement location="${excalibur-event.jar}"/>
  +    <!--<pathelement location="${excalibur-thread.jar}"/>-->
       <pathelement location="${build.classes}"/>
       <pathelement location="${checkstyle.jar}"/>
       <pathelement location="${xml-apis.jar}"/>
  -    <pathelement location="${servlet.jar}"/>
  +    <!--<pathelement location="${servlet.jar}"/>-->
       <pathelement path="${java.class.path}"/>
     </path>
   
  @@ -44,17 +45,17 @@
   
       <!-- secondary depedencies -->
   
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>
       <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkUtil"/>
       <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
       <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThreadcontext"/>
  -    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>
  +    <!--<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>-->
   
     </target>
   
     <target name="dependencies-test" depends="dist-jar, dependencies"
         description="Check unit test dependencies" unless="skip.dependencies">
         <!-- Need the jar to prevent recursive deps. -->
  -
       <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
     </target>
   
  @@ -70,10 +71,13 @@
        <copy todir="${extension.dir}" file="${excalibur-logger.jar}"/>
        <copy todir="${extension.dir}" file="${excalibur-meta.jar}"/>
        <copy todir="${extension.dir}" file="${excalibur-event.jar}"/>
  +     <copy todir="${extension.dir}" file="${commons-collections.jar}"/>
  +     <copy todir="${extension.dir}" file="${util.concurrent.jar}"/>
        <copy todir="${extension.dir}" file="${excalibur-collections.jar}"/>
  -     <copy todir="${extension.dir}" file="${excalibur-concurrent.jar}"/>
  +     <!--<copy todir="${extension.dir}" file="${excalibur-concurrent.jar}"/>-->
        <copy todir="${extension.dir}" file="${excalibur-threadcontext.jar}"/>
        <copy todir="${extension.dir}" file="${excalibur-util.jar}"/>
  +     <copy todir="${extension.dir}" file="${excalibur-thread.jar}"/>
        <copy todir="${extension.dir}" preservelastmodified="true">
          <fileset dir="${lib.dir}">
            <include name="xerces-2.0.1.jar"/>
  
  
  
  1.19      +9 -0      jakarta-avalon-excalibur/assembly/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/default.properties,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- default.properties	9 Oct 2002 16:59:58 -0000	1.18
  +++ default.properties	10 Oct 2002 06:26:04 -0000	1.19
  @@ -51,6 +51,10 @@
   excalibur-event.home=${basedir}/../event
   excalibur-event.lib=${excalibur-event.home}/build/lib
   excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.1.jar
  +# ----- Commons Collections, version 2.1 or later (from event) -----
  +commons-collections.jar=${excalibur-event.home}/lib/commons-collections-20021002.jar
  +# ----- Doug Lea's Concurrent Utils, version 1.3 or later (from event) -----
  +util.concurrent.jar=${excalibur-event.home}/lib/util.concurrent-1.3.1.jar
   
   # ----- Excalibur collections, version 1.0 or later -----
   excalibur-collections.home=${basedir}/../collections
  @@ -66,6 +70,11 @@
   excalibur-threadcontext.home=${basedir}/../threadcontext
   excalibur-threadcontext.lib=${excalibur-threadcontext.home}/build/lib
   excalibur-threadcontext.jar=${excalibur-threadcontext.lib}/excalibur-threadcontext-1.0.jar
  +
  +# ----- Excalibur thread, version 1.0 or later -----
  +excalibur-thread.home=${basedir}/../thread
  +excalibur-thread.lib=${excalibur-thread.home}/build/lib
  +excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.0.jar
   
   # ----- Excalibur util, version 1.0 or later -----
   excalibur-util.home=${basedir}/../util
  
  
  
  1.19      +1 -5      jakarta-avalon-excalibur/assembly/src/etc/project.mf
  
  Index: project.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/project.mf,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- project.mf	8 Sep 2002 14:36:56 -0000	1.18
  +++ project.mf	10 Oct 2002 06:26:04 -0000	1.19
  @@ -5,7 +5,7 @@
   Specification-Version: 2.0
   Implementation-Vendor: Apache Software Foundation
   Implementation-Version: 2.1
  -Extension-List: framework meta container configuration i18n logger extension collections
event concurrent context util
  +Extension-List: framework meta container configuration i18n logger extension collections
event context util
   framework-Extension-Name: avalon-framework
   framework-Specification-Version: 1.0
   framework-Implementation-Version: 4.1.2
  @@ -25,10 +25,6 @@
   collections-Specification-Version: 1.0
   event-Extension-Name: excalibur-event
   event-Specification-Version: 1.0
  -concurrent-Extension-Name: excalibur-concurrent
  -concurrent-Specification-Version: 1.0
  -context-Extension-Name: excalibur-threadcontext
  -context-Specification-Version: 1.0
   util-Extension-Name: excalibur-util
   util-Specification-Version: 1.0
   Class-Path: logkit.jar xerces-2.0.1.jar xml-apis.jar xalan-2.3.1.jar
  
  
  

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


Mime
View raw message