gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: gump/project excalibur.xml
Date Tue, 05 Oct 2004 08:29:15 GMT
leif        2004/10/05 01:29:15

  Modified:    project  excalibur.xml
  Log:
  Update the Excalibur projects to reflect the current names of the various
  instrument projects and jars.
  
  Revision  Changes    Path
  1.13      +71 -104   gump/project/excalibur.xml
  
  Index: excalibur.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/excalibur.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- excalibur.xml	23 Sep 2004 11:01:38 -0000	1.12
  +++ excalibur.xml	5 Oct 2004 08:29:14 -0000	1.13
  @@ -77,12 +77,9 @@
           <depend project="avalon-framework-impl" runtime="true"/>
   
           <depend project="commons-collections" runtime="true"/>
  -        <depend project="excalibur-instrument" runtime="true"/>
  -        <depend project="excalibur-instrument-manager" runtime="true" id="main"/>
  -        <depend property="excalibur-instrument-manager-interfaces.jar"
  -                project="excalibur-instrument-manager"
  -                runtime="true"
  -                id="interfaces"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
  +        <depend project="excalibur-instrument-mgr-api" runtime="true"/>
  +        <depend project="excalibur-instrument-mgr-impl" runtime="true"/>
           <depend project="excalibur-logger" runtime="true"/>
           <depend project="excalibur-pool" runtime="true"/>
           <depend project="avalon-logkit" runtime="true"/>
  @@ -209,7 +206,7 @@
           </ant>
   -->
   
  -        <depend project="excalibur-instrument" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
           <depend project="excalibur-pool" runtime="true"/>
           <depend project="excalibur-logger"/>
           <depend project="excalibur-component" id="component"/>
  @@ -311,7 +308,7 @@
           <!-- test-time dependencies -->
           <depend project="junit"/>
           <depend project="excalibur-pool"/>
  -        <depend project="excalibur-instrument"/>
  +        <depend project="excalibur-instrument-api"/>
           <depend property="logkit.jar" project="avalon-logkit"/>
   
           <!-- build-time dependencies -->
  @@ -402,8 +399,9 @@
           <depend project="commons-collections"/>
           <depend project="commons-beanutils-core"/>
           <depend project="concurrent"/>
  -        <depend project="excalibur-instrument"/>
  -        <depend project="excalibur-instrument-manager"/>
  +        <depend project="excalibur-instrument-api"/>
  +        <depend project="excalibur-instrument-mgr-api"/>
  +        <depend project="excalibur-instrument-mgr-impl"/>
           <depend project="excalibur-event-api"/>
           <depend project="excalibur-event-impl"/>
           <depend project="excalibur-pool-api"/>
  @@ -464,9 +462,9 @@
           <depend project="commons-collections"/>
           <depend project="commons-beanutils-core"/>
           <depend project="concurrent"/>
  -        <depend project="excalibur-instrument"/>
  -        <depend project="excalibur-instrument-spi" />
  -        <depend project="excalibur-instrument-impl" />
  +        <depend project="excalibur-instrument-api"/>
  +        <depend project="excalibur-instrument-mgr-api" />
  +        <depend project="excalibur-instrument-mgr-impl" />
           <depend project="excalibur-event-api"/>
           <depend project="excalibur-event-impl"/>
           <depend project="jakarta-bcel"/>
  @@ -526,8 +524,9 @@
           <depend project="excalibur-event-impl"/>
           <depend project="excalibur-logger"/>
           <depend project="excalibur-lifecycle-api"/>
  -        <depend project="excalibur-instrument"/>
  -        <depend project="excalibur-instrument-manager"/>
  +        <depend project="excalibur-instrument-api"/>
  +        <depend project="excalibur-instrument-mgr-api" />
  +        <depend project="excalibur-instrument-mgr-impl" />
           <depend project="excalibur-sourceresolve"/>
   <!--  Remove for time being and see what happens...
           <depend project="excalibur-i18n"/>
  @@ -627,7 +626,7 @@
       </project>
   -->
   
  -    <project name="excalibur-instrument">
  +    <project name="excalibur-instrument-api">
           <maven basedir="containerkit/instrument/api" goal="jar">
             <property name="component.version"  value="@@DATE@@"/>
           </maven>
  @@ -641,7 +640,7 @@
               <property name="project.version" value="@@DATE@@"/>
           </ant>
           -->
  -
  +        
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
  @@ -658,7 +657,7 @@
           <work nested="containerkit/instrument/api/target/test-classes"/>
   
           <home nested="containerkit/instrument/api/"/>
  -        <jar name="target/excalibur-instrument-api-1.2-dev.jar"/>
  +        <jar name="target/excalibur-instrument-api-@@DATE@@.jar"/>
   
           <junitreport nested="containerkit/instrument/api/target/docs/junitreports"/>
           
  @@ -666,24 +665,26 @@
                to="dev@excalibur.apache.org"/>
       </project>
   
  -    <project name="excalibur-instrument-spi">
  +    <project name="excalibur-instrument-mgr-api">
           <maven basedir="containerkit/instrument/mgr-api" goal="jar">
             <property name="component.version"  value="@@DATE@@"/>
           </maven>
  -        <package>org.apache.avalon.excalibur.instrument.manager.interfaces</package>
  +        <package>org.apache.avalon.excalibur.instrument.manager</package>
   
  +<!--
           <ant basedir="instrument-manager/spi" target="jar" buildfile="gump-build.xml">
  -            <!-- optional dependencies -->
  +
               <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <!-- test-time dependencies -->
  +            
               <depend property="junit.jar" project="junit"/>
               <property name="project.version" value="@@DATE@@"/>
               <property name="src.exclude.pattern" value="**/package.html"/>
           </ant>
  +-->
   
           <!-- runtime dependencies -->
           <depend project="avalon-framework-api" runtime="true"/>
  -        <depend property="excalibur-instrument.jar" project="excalibur-instrument" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -700,33 +701,35 @@
           <work nested="containerkit/instrument/mgr-api/target/test-classes"/>
   
           <home nested="containerkit/instrument/mgr-api"/>
  -        <jar name="target/excalibur-instrument-spi-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-mgr-api-@@DATE@@.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
  -    <project name="excalibur-instrument-impl">
  +    <project name="excalibur-instrument-mgr-impl">
           <maven basedir="containerkit/instrument/mgr-impl" goal="jar">
             <property name="component.version"  value="@@DATE@@"/>
           </maven>
  -        <package>org.apache.avalon.excalibur.instrument.manager</package>
  +        <package>org.apache.avalon.excalibur.instrument.manager.impl</package>
   
  +<!--
           <ant basedir="instrument-manager/impl" target="jar" buildfile="gump-build.xml">
  -            <!-- optional dependencies -->
  +            
               <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <!-- test-time dependencies -->
  +            
               <depend property="junit.jar" project="junit"/>
               <property name="project.version" value="@@DATE@@"/>
               <property name="src.exclude.pattern" value="**/package.html"/>
           </ant>
  +-->
   
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
   
  -        <depend project="excalibur-instrument" runtime="true"/>
  -        <depend project="excalibur-instrument-spi" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
  +        <depend project="excalibur-instrument-mgr-api" runtime="true"/>
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -743,34 +746,34 @@
           <work nested="containerkit/instrument/mgr-impl/target/test-classes"/>
   
           <home nested="containerkit/instrument/mgr-impl"/>
  -        <jar name="target/excalibur-instrument-impl-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-mgr-impl-@@DATE@@.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
  -    <project name="excalibur-instrument-http">
  +    <project name="excalibur-instrument-mgr-http">
           <maven basedir="containerkit/instrument/mgr-http" goal="jar">
             <property name="component.version"  value="@@DATE@@"/>
           </maven>
           <package>org.apache.avalon.excalibur.instrument.manager.http</package>
   
  -<!--
  -        <ant basedir="instrument-manager/http" target="jar" buildfile="gump-build.xml">
  +        <!--
  +        <ant basedir="containerkit/instrument/mgr-http" target="jar" buildfile="gump-build.xml">
   
               <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
   
               <property name="project.version" value="@@DATE@@"/>
               <property name="src.exclude.pattern" value="**/package.html"/>
           </ant>
  --->
  +        -->
  +        
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
   
  -        <depend project="excalibur-instrument" runtime="true"/>
  -        <depend project="excalibur-instrument-spi" runtime="true"/>
  -        <depend project="excalibur-instrument-impl" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
  +        <depend project="excalibur-instrument-mgr-api" runtime="true"/>
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  @@ -785,87 +788,32 @@
           <work nested="containerkit/instrument/mgr-http/target/classes"/>
   
           <home nested="containerkit/instrument/mgr-http"/>
  -        <jar name="target/excalibur-instrument-http-@@DATE@@.jar"/>
  +        <jar name="target/excalibur-instrument-mgr-http-@@DATE@@.jar"/>
           
           <nag from="Gump Integration Build &lt;dev@excalibur.apache.org&gt;"
                to="dev@excalibur.apache.org"/>
       </project>
   
  -<!-- This project has been removed by the Excalibur community. 
  -    <project name="excalibur-instrument-altrmi">
  -        <package>org.apache.avalon.excalibur.instrument.manager.altrmi</package>
  -
  -        <mkdir dir="instrument-manager/altrmi/target/classes"/>
  -
  -        <ant basedir="instrument-manager/altrmi" target="jar" buildfile="gump-build.xml">
  -            <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
  -            <property name="project.version" value="@@DATE@@"/>
  -            <property name="src.exclude.pattern" value="**/package.html"/>
  -        </ant>
  -
  -        <depend project="avalon-framework-api" runtime="true"/>
  -        <depend project="avalon-framework-legacy" runtime="true"/>
  -        <depend project="avalon-framework-impl" runtime="true"/>
  -
  -        <depend project="excalibur-instrument" runtime="true"/>
  -        <depend project="excalibur-instrument-spi" runtime="true"/>
  -        <depend project="excalibur-instrument-impl" runtime="true"/>
  -        <depend project="incubator-altrmi" id="common"/>
  -        <depend project="incubator-altrmi" id="client-api"/>
  -        <depend project="incubator-altrmi" id="client-impl"/>
  -        <depend project="incubator-altrmi" id="server-api"/>
  -        <depend project="incubator-altrmi" id="server-impl"/>
  -
  -        <depend project="ant" inherit="runtime"/>
  -        <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  -
  -        <option project="checkstyle" inherit="runtime"/>
  -
  -        <work nested="instrument-manager/altrmi/target/classes"/>
  -
  -        <home nested="instrument-manager/altrmi"/>
  -        <jar name="target/excalibur-instrument-http-@@DATE@@.jar"/>
  -    </project>
  -    
  -    <project name="excalibur-instrument-manager-altrmi">
  -      <depend project="excalibur-instrument-altrmi" inherit="jars"/>
  -    </project>
  -
  --->
  -
  -    <project name="excalibur-instrument-manager">
  -      <depend project="excalibur-instrument-spi" inherit="jars"/>
  -      <depend project="excalibur-instrument-impl" inherit="jars"/>
  -      <depend project="excalibur-instrument-http" inherit="jars"/>
  -    </project>
  -
       <project name="excalibur-instrument-client">
  -        <maven basedir="containerkit/instrument/client" goal="jar">
  +        <!-- The Instrument client is a standalone application rather than a jar, so
build the dev target. -->
  +        <maven basedir="containerkit/instrument/client" goal="dev">
             <property name="component.version"  value="@@DATE@@"/>
           </maven>
           <package>org.apache.avalon.excalibur.instrument.client</package>
   
  -<!--
  +        <!--
           <ant basedir="instrument-client" target="jar" buildfile="gump-build.xml">
               <property name="checkstyle.jar" project="checkstyle" reference="jarpath"/>
   
               <property name="project.version" value="@@DATE@@"/>
           </ant>
  --->
  +        -->
  +        
           <!-- runtime dependencies -->
  -        <depend property="altrmi-common.jar" project="incubator-altrmi" id="common"/>
  -        <depend property="altrmi-client-interfaces.jar" project="incubator-altrmi" id="client-api"/>
  -        <depend property="altrmi-client-impl.jar" project="incubator-altrmi" id="client-impl"/>
  -        <depend property="altrmi-server-interfaces.jar" project="incubator-altrmi" id="server-api"/>
  -        <depend property="altrmi-server-impl.jar" project="incubator-altrmi" id="server-impl"/>
  -
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
   
  -        <depend project="excalibur-instrument-manager" runtime="true" id="main"/>
  -
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
  @@ -885,6 +833,25 @@
                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">
             <property name="component.version"  value="@@DATE@@"/>
  @@ -1042,7 +1009,7 @@
           <depend project="excalibur-i18n" inherit="runtime"/>
   -->
           <depend project="excalibur-testcase" inherit="runtime"/> <!-- for testcase
-->
  -        <depend project="excalibur-instrument" inherit="runtime"/>
  +        <depend project="excalibur-instrument-api" inherit="runtime"/>
           <depend project="junit"/>
   
           <home nested="components/monitor"/>
  @@ -1161,7 +1128,7 @@
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
           <depend property="commons-collections" project="commons-collections"/>
  -        <depend project="excalibur-instrument" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
           
           <depend project="ant" inherit="runtime"/>
           <option project="checkstyle" inherit="runtime"/>
  @@ -1232,7 +1199,7 @@
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  -        <depend project="excalibur-instrument"/>
  +        <depend project="excalibur-instrument-api"/>
           <depend project="xml-xerces"/>
           <depend project="xml-xalan2"/>
           <depend project="jisp"/>
  @@ -1359,7 +1326,7 @@
           <depend project="excalibur-pool-instrumented" runtime="true"/>
           <depend project="commons-collections" runtime="true"/>
           <depend project="concurrent"/>
  -        <depend project="excalibur-instrument" runtime="true"/>
  +        <depend project="excalibur-instrument-api" runtime="true"/>
   
           <option project="checkstyle" inherit="runtime"/>
   
  @@ -1395,7 +1362,7 @@
           <depend project="saxon"/>
           <depend project="saxon6"/>
           <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
  -        <depend project="excalibur-instrument"/>
  +        <depend project="excalibur-instrument-api"/>
           <depend project="excalibur-component" id="component"/>
           <depend project="excalibur-pool-api" runtime="true"/>
           <depend project="excalibur-pool-impl" runtime="true"/>
  
  
  

Mime
View raw message