gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: gump/project avalon-phoenix.xml excalibur-legacy.xml excalibur.xml jakarta-jmeter.xml jakarta-turbine-fulcrum.xml
Date Sun, 24 Oct 2004 04:02:35 GMT
stefano     2004/10/23 21:02:35

  Modified:    project  avalon-phoenix.xml excalibur-legacy.xml
                        excalibur.xml jakarta-jmeter.xml
                        jakarta-turbine-fulcrum.xml
  Log:
  cleaning up leftovers
  
  Revision  Changes    Path
  1.77      +3 -2      gump/project/avalon-phoenix.xml
  
  Index: avalon-phoenix.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/avalon-phoenix.xml,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- avalon-phoenix.xml	23 Oct 2004 11:25:32 -0000	1.76
  +++ avalon-phoenix.xml	24 Oct 2004 04:02:35 -0000	1.77
  @@ -68,8 +68,9 @@
   
           <depend project="excalibur-legacy" runtime="true"/>
           <depend project="excalibur-logger" runtime="true"/>
  -        <depend project="excalibur-instrument-manager" runtime="true"/>
  -        <depend project="excalibur-instrument" runtime="true"/>
  +        <depend project="excalibur-instrument-mgr-api" runtime="true"/>
  +        <depend project="excalibur-instrument-mgr-impl" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
           <depend project="phoenix-excalibur-monitor" runtime="true"/>
           <depend project="ant" runtime="true"/>
           
  
  
  
  1.4       +0 -10     gump/project/excalibur-legacy.xml
  
  Index: excalibur-legacy.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/excalibur-legacy.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- excalibur-legacy.xml	16 Oct 2004 15:59:43 -0000	1.3
  +++ excalibur-legacy.xml	24 Oct 2004 04:02:35 -0000	1.4
  @@ -24,16 +24,6 @@
     <project name="excalibur-legacy">
       <jar name="excalibur-compatibility-1.1.jar" id="compatibility"/>
       <jar name="excalibur-i18n-1.1.jar" id="i18n"/>
  -
  -    <!--
  -    THE FOLLWING JAR NEEDS TO BE ADDED TO GUMP.  
  -    Jar download available here:
  -    http://www.apache.org/dist/java-repository/excalibur-configuration/jars/
  -    -->
  -
  -    <!--
       <jar name="excalibur-configuration-1.2.jar" id="configuration"/>
  -    -->
  -
     </project>
   </module>
  
  
  
  1.46      +2 -142    gump/project/excalibur.xml
  
  Index: excalibur.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/excalibur.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- excalibur.xml	23 Oct 2004 10:17:28 -0000	1.45
  +++ excalibur.xml	24 Oct 2004 04:02:35 -0000	1.46
  @@ -24,40 +24,6 @@
       
       <svn repository="excalibur-svn" dir="trunk"/>
   
  -     <!-- 
  -     This project has been removed by the Excalibur community.
  -     The project was the merge of several packages which previously
  -     existed seperately:
  -
  -             excalibur-cli
  -             excalibur-collections
  -             excalibur-concurrent
  -             excalibur-io
  -      -->
  -      <!--
  -      <project name="excalibur-compatibility">
  -        <package>org.apache.avalon.excalibur</package>
  -
  -        <ant basedir="compatibility" target="jar" buildfile="gump-build.xml">
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  -
  -        <depend project="junit" inherit="runtime"/>
  -        <depend project="ant" inherit="runtime"/>
  -
  -        <mkdir dir="compatibility/target/classes"/>
  -        <mkdir dir="compatibility/target/test-classes"/>
  -        <work nested="compatibility/target/classes"/>
  -        <work nested="compatibility/target/test-classes"/>
  -
  -        <home nested="compatibility"/>
  -        <jar name="target/excalibur-compatibility-@@DATE@@.jar"/>
  -
  -        <junitreport nested="compatibility/target/docs/junitreports"/>
  -
  -    </project>
  -    -->
  -
       <project name="excalibur-component">
   
           <package>org.apache.avalon.excalibur.component</package>
  @@ -136,48 +102,6 @@
                to="dev@excalibur.apache.org"/>
       </project>
   
  -<!-- Project has been removed by the Excalibur community -->
  -    <!--
  -    <project name="excalibur-configuration">
  -        <package>org.apache.excalibur.configuration</package>
  -
  -        <ant basedir="configuration" target="dist" buildfile="gump-build.xml">
  -            <property name="project.name" value="excalibur-configuration"/>
  -            <property name="package-version" value="@@DATE@@"/>
  -            <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="false"/>
  -            <property name="skip.dependencies" value="true"/>
  -
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  -
  -        <depend project="avalon-framework-api" runtime="true"/>
  -        <depend project="avalon-framework-legacy" runtime="true"/>
  -        <depend project="avalon-framework-impl" runtime="true"/>
  -        <depend property="isorelax.jar" project="iso-relax" runtime="true"/>
  -        <depend project="jing" runtime="true"/>
  -
  -        <depend property="junit.jar" project="junit"/>
  -
  -        <depend project="ant" inherit="runtime"/>
  -        <depend project="xml-xerces"/>
  -        <depend project="xalan"/>
  -
  -        <option project="checkstyle" inherit="runtime"/>
  -
  -        <work nested="configuration/target/classes"/>
  -        <work nested="configuration/target/test-classes"/>
  -
  -        <home nested="configuration"/>
  -
  -        <jar name="target/excalibur-configuration-@@DATE@@.jar"/>
  -
  -        <junitreport nested="configuration/target/docs/junitreports"/>
  -
  -    </project>
  --->
  -
       <project name="excalibur-datasource">
           <package>org.apache.avalon.excalibur.datasource</package>
   
  @@ -222,11 +146,6 @@
                to="dev@excalibur.apache.org"/>
       </project>
       
  -    <project name="excalibur-event">
  -      <depend project="excalibur-event-api" inherit="jars" />
  -      <depend project="excalibur-event-impl" inherit="jars" />
  -    </project>
  -    
       <project name="excalibur-event-api">
           <maven basedir="deprecated/event/api" goal="jar"/>
           <package>org.apache.excalibur.event</package>
  @@ -417,9 +336,6 @@
           <depend project="excalibur-sourceresolve"/>
           <depend project="excalibur-lifecycle-api"/>
           <depend project="excalibur-lifecycle-impl"/>
  -<!--  Remove for time being and see what happens...
  -        <depend project="excalibur-i18n"/>
  --->
           <depend project="excalibur-fortress-meta"/>
           <depend project="excalibur-fortress-container-impl"/>
           <depend project="qdox"/>
  @@ -528,33 +444,6 @@
                to="dev@excalibur.apache.org"/>
       </project>
       
  -<!-- Project removed by the Excalibur community.
  -    <project name="excalibur-i18n">
  -        <maven basedir="deprecated/event" goal="jar"/>
  -        <package>org.apache.avalon.excalibur.i18n</package>
  -
  -        <ant basedir="i18n" target="dist" buildfile="gump-build.xml">
  -            <property name="project.name" value="excalibur-i18n"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -        </ant>
  -
  -        <depend project="ant" inherit="runtime"/>
  -        <depend project="xml-xerces"/>
  -        <depend project="xalan"/>
  -        <depend project="junit"/>
  -
  -        <option project="checkstyle" inherit="runtime"/>
  -
  -        <work nested="i18n/target/classes"/>
  -        <work nested="i18n/target/test-classes"/>
  -
  -        <home nested="i18n"/>
  -        <jar name="target/excalibur-i18n-@@DATE@@.jar"/>
  -
  -        <junitreport nested="i18n/target/docs/junitreports"/>
  -    </project>
  --->
  -
       <project name="excalibur-instrument-api">
           <maven basedir="containerkit/instrument/api" goal="jar"/>
           <package>org.apache.excalibur.instrument</package>
  @@ -710,30 +599,6 @@
                to="dev@excalibur.apache.org"/>
       </project>
   
  -    <!-- Old instrument project aliases.  Do we need to maintain these for external
files? -->
  -    
  -    <project name="excalibur-instrument">
  -      <depend project="excalibur-instrument-api" inherit="jars"/>
  -    </project>
  -    
  -    <project name="excalibur-instrument-manager">
  -      <depend project="excalibur-instrument-mgr-api" inherit="jars"/>
  -      <depend project="excalibur-instrument-mgr-impl" inherit="jars"/>
  -      <depend project="excalibur-instrument-mgr-http" inherit="jars"/>
  -    </project>
  -    
  -    <project name="excalibur-instrument-spi">
  -      <depend project="excalibur-instrument-mgr-api" inherit="jars"/>
  -    </project>
  -    
  -    <project name="excalibur-instrument-impl">
  -      <depend project="excalibur-instrument-mgr-impl" inherit="jars"/>
  -    </project>
  -    
  -    <project name="excalibur-instrument-http">
  -      <depend project="excalibur-instrument-mgr-http" inherit="jars"/>
  -    </project>
  -
       <project name="excalibur-lifecycle-api">
           <maven basedir="containerkit/lifecycle/api" goal="jar"/>
           <package>org.apache.avalon.lifecycle</package>
  @@ -825,10 +690,8 @@
           <depend project="logging-log4j" runtime="true"/>
           <depend project="javamail" runtime="true" ids="mailapi"/>
           <depend project="jms" runtime="true"/>
  -<!--  Remove for time being and see what happens...
  -        <depend project="excalibur-i18n" inherit="runtime" runtime="true"/>
  --->
  -        <depend project="junit"/>
  +        
  +	<depend project="junit"/>
           <depend project="xml-xerces"/>
           <depend project="xalan"/>
   
  @@ -862,9 +725,6 @@
           
           <!-- test-time dependencies -->
           <depend project="commons-collections" inherit="runtime"/>
  -<!--  Remove for time being and see what happens...
  -        <depend project="excalibur-i18n" inherit="runtime"/>
  --->
           <depend project="excalibur-testcase" inherit="runtime"/> <!-- for testcase
-->
           <depend project="excalibur-instrument-api" inherit="runtime"/>
           <depend project="junit"/>
  
  
  
  1.113     +11 -13    gump/project/jakarta-jmeter.xml
  
  Index: jakarta-jmeter.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jmeter.xml,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- jakarta-jmeter.xml	23 Oct 2004 11:04:20 -0000	1.112
  +++ jakarta-jmeter.xml	24 Oct 2004 04:02:35 -0000	1.113
  @@ -82,7 +82,7 @@
   
       <depend project="excalibur-datasource"/>
       <depend project="excalibur-pool"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
   
       <depend project="xml-batik"/>
   
  @@ -119,7 +119,7 @@
       <jar name="lib/xstream-1.0.1.jar" id="xstream"/>
     </project>
     
  -  	<project name="jakarta-jmeter-cvs">
  +  <project name="jakarta-jmeter-cvs">
           <!-- Build JMeter from CVS versions of dependencies -->
       <package>org.apache.jmeter</package>
   
  @@ -352,7 +352,5 @@
       <license name="LICENSE"/>
   
     </project>
  -
  -
   
   </module>
  
  
  
  1.88      +15 -15    gump/project/jakarta-turbine-fulcrum.xml
  
  Index: jakarta-turbine-fulcrum.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-turbine-fulcrum.xml,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- jakarta-turbine-fulcrum.xml	23 Oct 2004 11:14:18 -0000	1.87
  +++ jakarta-turbine-fulcrum.xml	24 Oct 2004 04:02:35 -0000	1.88
  @@ -38,7 +38,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -69,7 +69,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -295,7 +295,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -324,7 +324,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -361,7 +361,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -439,7 +439,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -477,7 +477,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -518,7 +518,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -553,7 +553,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -587,7 +587,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -625,7 +625,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -657,7 +657,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -687,7 +687,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -720,7 +720,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  @@ -751,7 +751,7 @@
       <depend project="logging-log4j"/>
       <depend project="commons-configuration"/>
       <depend project="excalibur-component"/>
  -    <depend project="excalibur-instrument"/>
  +    <depend project="excalibur-instrument-api"/>
       <depend project="excalibur-logger"/>
       <depend project="excalibur-pool"/>
       <depend project="commons-jelly"/>
  
  
  

Mime
View raw message