Return-Path: 
 <avalon-cvs-return-8233-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 11910 invoked from network); 7 Jul 2002 04:26:28 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 7 Jul 2002 04:26:28 -0000
Received: (qmail 25878 invoked by uid 97); 7 Jul 2002 04:26:47 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 25825 invoked by uid 97); 7 Jul 2002 04:26:47 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 25805 invoked by uid 97); 7 Jul 2002 04:26:46 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 7 Jul 2002 04:26:22 -0000
Message-ID: <20020707042622.50843.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/assembly build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2002/07/06 21:26:22

  Modified:    assembly build.xml
  Log:
  containerkit independence
  
  Revision  Changes    Path
  1.9       +2 -27     jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	5 Jul 2002 09:30:06 -0000	1.8
  +++ build.xml	7 Jul 2002 04:26:22 -0000	1.9
  @@ -31,7 +31,6 @@
   
     <property name="apps.path" value="../../jakarta-avalon-apps" />
     <property name="excalibur.path" value="../../jakarta-avalon-excalibur" />
  -  <property name="containerkit.path" value="${excalibur.path}/containerkit" />
   
     <property name="lib" value="lib" />
     <property name="src" value="src" />
  @@ -43,7 +42,6 @@
     <property name="javadoc.root.path"  value="${dist}/javadoc" />
     <property name="avalon.href"  value="http://jakarta.apache.org/avalon/api/" />
     <property name="jdk.href"  value="http://java.sun.com/j2se/1.4/docs/api/" />
  -  <property name="containerkit.href"  value="../../../${containerkit.path}/dist/docs/api" />
     <property name="overview.html" value="${etc}/overview.html" />
     <property name="project.manifest" value="project.mf" />
   
  @@ -134,6 +132,7 @@
             <include name="**/*.xinfo"/>
             <include name="**/*.xml"/>
             <include name="**/*.properties"/>
  +          <include name="**/*.xprofile"/>
           </fileset>
         </copy>
         <jar jarfile="${dist}/demo.jar" basedir="${build}/demo" manifest="demo/src/etc/demo.mf"/>
  @@ -168,7 +167,6 @@
   	  </classpath>
   	  <link href="${jdk.href}" />
   	  <link href="${avalon.href}" />
  -	  <link href="${containerkit.href}" />
       </javadoc>
     </target>
   
  @@ -182,7 +180,6 @@
            <include name="avalon-framework.jar"/>
            <include name="logkit.jar"/>
            <include name="excalibur-i18n-1.0.jar" />
  -         <include name="excalibur-containerkit-1.0.jar" />
            <include name="excalibur-extension-1.0a.jar" />
            <include name="excalibur-configuration-1.0.jar" />
            <include name="excalibur-io-1.1.jar" />
  @@ -198,31 +195,9 @@
     </target>
   
     <target name="patch">
  -    <replace token="org.apache.excalibur.containerkit.metainfo" value="org.apache.excalibur.meta.info" dir="src/java">
  +    <replace token="getDescription" value="getInfo" dir="src/java">
           <include name="**/*.*"/>
       </replace>
  -    <replace token="org.apache.excalibur.containerkit.metadata" value="org.apache.excalibur.meta.data" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -    <replace token="org.apache.excalibur.containerkit.verifier" value="org.apache.excalibur.meta.verifier" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -    <replace token="org.apache.excalibur.containerkit.infobuilder" value="org.apache.excalibur.meta.builder" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -    <replace token=".getComponentInfo" value=".getInfo" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -    <replace token="DependencyMetaData" value="Assignment" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -    <replace token="org.apache.excalibur.containerkit.dependency.DependencyMap" value="org.apache.excalibur.merlin.kernel.Map" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -    <replace token="DependencyMap" value="Map" dir="src/java">
  -        <include name="**/*.*"/>
  -    </replace>
  -
     </target>
   
   </project>
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>