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-apps/enterprise/orb build.xml
Date Sun, 03 Mar 2002 16:50:49 GMT
mcconnell    02/03/03 08:50:49

  Modified:    enterprise/orb build.xml
  Log:
  updated to include merlin support
  
  Revision  Changes    Path
  1.4       +15 -12    jakarta-avalon-apps/enterprise/orb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	2 Mar 2002 17:48:55 -0000	1.3
  +++ build.xml	3 Mar 2002 16:50:49 -0000	1.4
  @@ -29,9 +29,10 @@
         clean            - destroy the build directory
         build            - invokes the general build target
         dist             - executes build, javadoc and support file creation
  -      examples         - builds examples
  -      hello            - runs the "hello" embedded orb initializer demo as a java command
  -      hello-pipeline   - runs the "hello" demo as a component
  +      examples         - builds the hello demo example
  +
  +      hello            - runs the "hello" embedded orb initializer demo via the demo main
  +      load-hello       - runs the "hello" demo as a component
         
       </echo>
     </target>
  @@ -201,30 +202,32 @@
        </java>
     </target>
   
  -  <target name="pipeline.context">
  -    <available property="pipeline.available" file="${tools.lib.path}/pipeline.jar"/>
  +  <target name="loader.context">
  +    <available property="loader.available" file="${tools.lib.path}/merlin.jar"/>
     </target>
   
  -  <target name="pipeline.defintion" depends="pipeline.context" if="pipeline.available">
  -    <taskdef name="pipeline" classname="org.apache.avalon.excalibur.service.ant.Pipe">
  +  <target name="loader.defintion" depends="loader.context" if="loader.available">
  +    <taskdef name="load" classname="org.apache.avalon.excalibur.service.ant.Load">
         <classpath>
  -        <pathelement location="${tools.lib.path}/pipeline.jar"/>
  +        <pathelement location="${tools.lib.path}/merlin.jar"/>
  +        <pathelement location="${tools.lib.path}/avalon-framework.jar"/>
  +        <pathelement location="${tools.lib.path}/logkit.jar"/>
         </classpath>
       </taskdef>
     </target>
    
  -  <target name="hello-pipeline" depends="pipeline.defintion,examples" if="pipeline.available">
  +  <target name="load-hello" depends="loader.defintion,examples" if="loader.available">
   
       <!-- 
       After loading jar files declared under a fileset, apply lifecycle
       pipeline processing to the class referenced in the target attribute.
       -->
   
  -    <pipeline target="hello.HelloDemo" priority="DEBUG" disposal="true" verbose="false">
  +    <load target="hello.HelloDemo" priority="DEBUG" disposal="true" verbose="false">
   
         <classpath>
            <fileset dir="${tools.lib.path}">
  -             <include name="pipeline.jar"/>
  +             <include name="merlin.jar"/>
                <include name="avalon-framework.jar"/>
                <include name="logkit.jar"/>
            </fileset>
  @@ -244,7 +247,7 @@
            <include name="${orb.examples.jar}"/>
         </fileset>
   
  -    </pipeline>
  +    </load>
   
     </target>
   
  
  
  

--
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