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/pss build.xml
Date Wed, 22 May 2002 13:03:05 GMT
mcconnell    02/05/22 06:03:05

  Modified:    enterprise/ins build.xml
               enterprise/orb/src/examples/hello/java/hello HelloDemo.xinfo
               enterprise/pss build.xml
  Log:
  no message
  
  Revision  Changes    Path
  1.6       +44 -21    jakarta-avalon-apps/enterprise/ins/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/ins/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	18 May 2002 11:20:27 -0000	1.5
  +++ build.xml	22 May 2002 13:03:04 -0000	1.6
  @@ -47,8 +47,10 @@
     <property name="VERSION" value="${MAJOR}.${MINOR}.${MICRO}"/>
   
     <property name="enterprise" value=".." />
  -  <property name="tools.path" value="${enterprise}/tools" />
  -  <property name="tools.lib.path" value="${tools.path}/lib" />
  +  <property name="apps.path" value="${enterprise}/.." />
  +  <property name="common.path" value="${apps}/common" />
  +  <property name="common.tools.path" value="${common.path}/tools" />
  +  <property name="common.lib.path" value="${common.path}/lib" />
     <property name="orb.path"  value="${enterprise}/orb" />
     <property name="orb.lib.path"  value="${orb.path}/lib" />
     <property name="orb.dist.path"  value="${orb.path}/dist" />
  @@ -80,14 +82,29 @@
         <fileset dir="${orb.dist.path}">
           <include name="*.jar" />
         </fileset>
  -      <fileset dir="${tools.lib.path}">
  -        <include name="*.jar" />
  +      <fileset dir="${common.lib.path}">
  +        <include name="logkit.jar" />
  +        <include name="avalon-framework.jar" />
  +        <include name="excalibur-configuration.jar" />
  +        <include name="excalibur-context.jar" />
  +        <include name="merlin.jar" />
         </fileset>
         <fileset dir="${pss.dist.path}">
           <include name="*.jar" />
         </fileset>
     </path>
   
  +  <path id="merlin.classpath">
  +      <fileset dir="${common.lib.path}">
  +        <include name="logkit.jar" />
  +        <include name="avalon-framework.jar" />
  +        <include name="excalibur-configuration.jar" />
  +        <include name="excalibur-context.jar" />
  +        <include name="merlin.jar" />
  +      </fileset>
  +  </path>
  +
  +
     <!-- MAIN TARGETS -->
   
     <target name="all" depends="clean,dist,javadoc"/>
  @@ -288,7 +305,7 @@
       </javadoc>
     </target>
   
  -  <target name="demo" depends="loader.validation,build" if="merlin.available">
  +  <target name="demo" depends="merlin.validation,build" if="merlin.available">
   
       <echo message="Executing ${project.title} demo."/>
   
  @@ -299,6 +316,11 @@
   
       <load target="${demo.class}" 
         priority="${demo.priority}" disposal="${demo.disposal}" verbose="${demo.verbose}">
  +
  +      <classpath>
  +	    <path refid="merlin.classpath" />
  +	</classpath>
  +
         <fileset dir="${dist}">
            <include name="*.jar"/>
         </fileset>
  @@ -311,32 +333,33 @@
         <fileset dir="${pss.dist.path}">
            <include name="*.jar"/>
         </fileset>
  -      <fileset dir="${tools.lib.path}">
  -         <include name="*.jar"/>
  -      </fileset>
       </load>
   
     </target>
   
  -  <target name="loader.context">
  -    <available property="merlin.available" file="${ant.home}/lib/merlin.jar"/>
  +  <target name="merlin.context">
  +    <available property="merlin.available" 
  +       classname="org.apache.excalibur.merlin.ant.Load" >
  +       <classpath>
  +          <path refid="merlin.classpath"/>
  +	 </classpath>
  +    </available>
     </target>
   
  -  <target name="loader.defintion" depends="loader.context" if="merlin.available">
  -    <taskdef resource="merlin.properties"/>
  +  <target name="merlin.defintion" depends="merlin.context" if="merlin.available">
  +    <taskdef resource="merlin.properties">
  +       <classpath>
  +          <path refid="merlin.classpath"/>
  +	 </classpath>
  +    </taskdef>
     </target>
    
  -  <target name="loader.validation" depends="loader.defintion" unless="merlin.available">
  +  <target name="merlin.validation" depends="merlin.defintion" unless="merlin.available">
       <echo>
   
  -     Merlin is not installed in your Ant library.
  -     In order to use the "load" task the following jar files 
  -     must be added to your ${ant.home}/lib directory:
  -
  -       - merlin.jar
  -       - avalon-framework.jar
  -       - logkit.jar
  -       - xerces.jar (pre JRE 1.4 only)
  +    Ignoring load task.
  +    Could not locate Merlin in the classpath.
  +
       </echo>
     </target>
   
  
  
  
  1.4       +2 -1      jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloDemo.xinfo
  
  Index: HelloDemo.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/orb/src/examples/hello/java/hello/HelloDemo.xinfo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HelloDemo.xinfo	12 May 2002 05:53:50 -0000	1.3
  +++ HelloDemo.xinfo	22 May 2002 13:03:05 -0000	1.4
  @@ -11,7 +11,8 @@
   
   <blockinfo>
   
  -  <block name="hello">
  +  <block>
  +    <name>hello</name>
       <version>1.0</version>
     </block>
   
  
  
  
  1.7       +8 -4      jakarta-avalon-apps/enterprise/pss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/pss/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	18 May 2002 13:27:48 -0000	1.6
  +++ build.xml	22 May 2002 13:03:05 -0000	1.7
  @@ -61,7 +61,6 @@
   
     <!-- tools -->
     <property name="tools.path" value="${enterprise}/tools" />
  -  <property name="tools.lib.path" value="${tools.path}/lib" />
   
     <!-- ORB package dependecies -->
     <property name="orb.path" value="${enterprise}/orb" />
  @@ -99,11 +98,16 @@
         <fileset dir="${ots.lib.path}">
           <include name="*.jar" />
         </fileset>
  -      <fileset dir="${tools.lib.path}">
  -        <include name="*.jar" />
  +      <fileset dir="${common.path}/lib">
  +        <include name="logkit.jar" />
  +        <include name="avalon-framework.jar" />
  +        <include name="excalibur-configuration.jar" />
  +        <include name="excalibur-context.jar" />
         </fileset>
         <fileset dir="../../common/lib">
  -        <include name="*.jar" />
  +        <include name="logkit.jar" />
  +        <include name="avalon-framework.jar" />
  +        <include name="excalibur-configuration.jar" />
         </fileset>
         
     </path>
  
  
  

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