You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by je...@apache.org on 2002/04/04 16:14:19 UTC

cvs commit: jakarta-avalon-excalibur/instrument-manager ant.properties.sample

jefft       02/04/04 06:14:19

  Modified:    .        Tag: depchecking ant.properties.sample
               altrmi/src/xdocs generating-proxies.xml
               instrument-client Tag: depchecking ant.properties.sample
                        build.xml default.properties
               instrument-manager Tag: depchecking ant.properties.sample
  Log:
  - Some changes from org.apache.commons.altrmi to org.apache.excalibur.altrmi.
  - Get instrument-client building, by moving the taskdef inside a target, so
    it's only encountered after the class is compiled.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.3   +8 -8      jakarta-avalon-excalibur/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/ant.properties.sample,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- ant.properties.sample	1 Apr 2002 08:57:02 -0000	1.8.2.2
  +++ ant.properties.sample	4 Apr 2002 14:14:18 -0000	1.8.2.3
  @@ -10,7 +10,7 @@
   # components. They override properties in component-specific ant.properties
   # files.
   #
  -# $Id: ant.properties.sample,v 1.8.2.2 2002/04/01 08:57:02 jefft Exp $
  +# $Id: ant.properties.sample,v 1.8.2.3 2002/04/04 14:14:18 jefft Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -64,13 +64,13 @@
   excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=${base.path}/jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-client-impl.jar=${commons-altrmi.home}/commons-altrmi-client-impl.jar
  -commons-altrmi-client-interfaces.jar=${commons-altrmi.home}/commons-altrmi-client-interfaces.jar
  -commons-altrmi-server-impl.jar=${commons-altrmi.home}/commons-altrmi-server-impl.jar
  -commons-altrmi-server-interfaces.jar=${commons-altrmi.home}/commons-altrmi-server-interfaces.jar
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-generator.jar=${commons-altrmi.home}/commons-altrmi-generator.jar
  +excalibur-altrmi.home=${base.path}/jakarta-commons-sandbox/altrmi/dist
  +excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl.jar
  +excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
   # ----- Java Management Extensions (JMX) RI, version 1.0.1 or later -----
   jmx.home=${base.path}/jmx-1_0_1-ri_bin/jmx
  
  
  
  1.2       +3 -3      jakarta-avalon-excalibur/altrmi/src/xdocs/generating-proxies.xml
  
  Index: generating-proxies.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/xdocs/generating-proxies.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- generating-proxies.xml	3 Apr 2002 21:46:33 -0000	1.1
  +++ generating-proxies.xml	4 Apr 2002 14:14:19 -0000	1.2
  @@ -26,8 +26,8 @@
   <![CDATA[
   <altrmiproxies genname="Hello" srcgendir="${build.home}/genjava" 
       classgendir="${build.home}/classes2" verbose="true"
  -    interfaces="org.apache.commons.altrmi.test.TestInterface" 
  -    additionalfacades="org.apache.commons.altrmi.test.TestInterface2">
  +    interfaces="org.apache.excalibur.altrmi.test.TestInterface" 
  +    additionalfacades="org.apache.excalibur.altrmi.test.TestInterface2">
     <classpath>
       <pathelement location="${build.home}/classes"/>
     </classpath>
  @@ -59,7 +59,7 @@
     <footer>
       <legal>
         Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
  -      $Revision: 1.1 $ $Date: 2002/04/03 21:46:33 $
  +      $Revision: 1.2 $ $Date: 2002/04/04 14:14:19 $
       </legal>
     </footer>
   </document>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +6 -6      jakarta-avalon-excalibur/instrument-client/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/ant.properties.sample,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- ant.properties.sample	1 Apr 2002 08:57:04 -0000	1.2.2.1
  +++ ant.properties.sample	4 Apr 2002 14:14:19 -0000	1.2.2.2
  @@ -9,7 +9,7 @@
   # The property values in ant.properties are overridden by
   # ${user.home}/.ant.properties and ../ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2.2.1 2002/04/01 08:57:04 jefft Exp $
  +# $Id: ant.properties.sample,v 1.2.2.2 2002/04/04 14:14:19 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -38,11 +38,11 @@
   excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-client-impl.jar=${commons-altrmi.home}/commons-altrmi-client-impl.jar
  -commons-altrmi-client-interfaces.jar=${commons-altrmi.home}/commons-altrmi-client-interfaces.jar
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-generator.jar=${commons-altrmi.home}/commons-altrmi-generator.jar
  +excalibur-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  +excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl.jar
  +excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces.jar
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  
  1.9.2.4   +13 -12    jakarta-avalon-excalibur/instrument-client/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/build.xml,v
  retrieving revision 1.9.2.3
  retrieving revision 1.9.2.4
  diff -u -r1.9.2.3 -r1.9.2.4
  --- build.xml	1 Apr 2002 11:57:27 -0000	1.9.2.3
  +++ build.xml	4 Apr 2002 14:14:19 -0000	1.9.2.4
  @@ -18,19 +18,14 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
  -        <pathelement location="${commons-altrmi-client-impl.jar}"/>
  -        <pathelement location="${commons-altrmi-client-interfaces.jar}"/>
  -        <pathelement location="${commons-altrmi-common.jar}"/>
  -        <pathelement location="${commons-altrmi-generator.jar}"/>
  +        <pathelement location="${excalibur-altrmi-client-impl.jar}"/>
  +        <pathelement location="${excalibur-altrmi-client-interfaces.jar}"/>
  +        <pathelement location="${excalibur-altrmi-common.jar}"/>
  +        <pathelement location="${excalibur-altrmi-generator.jar}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
       <property name="cp" refid="project.class.path"/>
  -
  -    <taskdef name="altrmiproxies"
  -        classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask">
  -        <classpath refid="project.class.path" />
  -    </taskdef>
           
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  @@ -52,8 +47,8 @@
               <property name="proj.home" value="${basedir}/../../jakarta-avalon"/>
          </ant>
          <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="commons-altrmi-client-impl.jar"/>
  -            <property name="path" value="${commons-altrmi-client-impl.jar}"/>
  +            <property name="name" value="excalibur-altrmi-client-impl.jar"/>
  +            <property name="path" value="${excalibur-altrmi-client-impl.jar}"/>
           </ant>
          <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
               <property name="name" value="excalibur-instrument-manager-0.1.jar"/>
  @@ -118,7 +113,13 @@
           <delete>
               <fileset dir="${build.classes}" includes="AltrmiGenerated*.class"/>
           </delete>
  -        
  +
  +        <echo>cp is ${cp}</echo>
  +        <taskdef name="altrmiproxies"
  +            classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
  +            <classpath refid="project.class.path" />
  +        </taskdef>
  +
           <altrmiproxies genname="InstrumentManagerClient"
               srcgendir="${build.genjava}" 
               classgendir="${build.classes}" 
  
  
  
  1.1.2.4   +5 -5      jakarta-avalon-excalibur/instrument-client/Attic/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/Attic/default.properties,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- default.properties	4 Apr 2002 00:42:29 -0000	1.1.2.3
  +++ default.properties	4 Apr 2002 14:14:19 -0000	1.1.2.4
  @@ -27,11 +27,11 @@
   
   
   # ----- Altrmi -----
  -commons-altrmi.home=${basedir}/../altrmi/dist
  -commons-altrmi-client-impl.jar=${commons-altrmi.home}/commons-altrmi-client-impl.jar
  -commons-altrmi-client-interfaces.jar=${commons-altrmi.home}/commons-altrmi-client-interfaces.jar
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-generator.jar=${commons-altrmi.home}/commons-altrmi-generator.jar
  +excalibur-altrmi.home=${basedir}/../altrmi/dist
  +excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl.jar
  +excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces.jar
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +5 -5      jakarta-avalon-excalibur/instrument-manager/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/ant.properties.sample,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- ant.properties.sample	1 Apr 2002 08:57:04 -0000	1.2.2.2
  +++ ant.properties.sample	4 Apr 2002 14:14:19 -0000	1.2.2.3
  @@ -9,7 +9,7 @@
   # The property values in ant.properties are overridden by
   # ${user.home}/.ant.properties and ../ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2.2.2 2002/04/01 08:57:04 jefft Exp $
  +# $Id: ant.properties.sample,v 1.2.2.3 2002/04/04 14:14:19 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -50,10 +50,10 @@
   excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-server-impl.jar=${commons-altrmi.home}/commons-altrmi-server-impl.jar
  -commons-altrmi-server-interfaces.jar=${commons-altrmi.home}/commons-altrmi-server-interfaces.jar
  +excalibur-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>