Return-Path: 
 <cvs-return-17296-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 5943 invoked by uid 500); 4 Jul 2003 07:33:15 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 5931 invoked by uid 500); 4 Jul 2003 07:33:15 -0000
Received: (qmail 5925 invoked from network); 4 Jul 2003 07:33:15 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 4 Jul 2003 07:33:15 -0000
Received: (qmail 91741 invoked by uid 1438); 4 Jul 2003 07:33:13 -0000
Date: 4 Jul 2003 07:33:13 -0000
Message-ID: <20030704073313.91740.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: avalon-sandbox-cvs@apache.org
Subject: cvs commit: avalon-sandbox/merlin/merlin-plugin plugin.jelly
 project.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2003/07/04 00:33:13

  Modified:    merlin/merlin-plugin plugin.jelly project.xml
  Log:
  Synchronization with the introduction of the composition package.
  
  Revision  Changes    Path
  1.15      +0 -9      avalon-sandbox/merlin/merlin-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly	25 Jun 2003 03:10:03 -0000	1.14
  +++ plugin.jelly	4 Jul 2003 07:33:13 -0000	1.15
  @@ -40,11 +40,6 @@
           format="${merlin.meta.format}" 
           force="${merlin.meta.force}"
           postfix="${merlin.meta.type.postfix}">
  -          <!--
  -          <ant:src>
  -            <ant:path refid="maven.compile.src.set"/>
  -          </ant:src>
  -          -->
   
           <j:if test="${javaSourcesPresent == 'true'}">
             <ant:fileset dir="${maven.src.dir}/java">
  @@ -245,10 +240,6 @@
           <include name="**/*.*"/>
         </fileset>
         <mbeaninterface/>
  -      <!--
  -      <mlet/>
  -      <mx4jdescription/>
  -      -->
       </jmx>
   
     </goal>
  
  
  
  1.8       +22 -13    avalon-sandbox/merlin/merlin-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	1 Jul 2003 14:12:45 -0000	1.7
  +++ project.xml	4 Jul 2003 07:33:13 -0000	1.8
  @@ -39,7 +39,6 @@
         <artifactId>avalon-meta</artifactId>
         <version>1.0</version>
       </dependency>
  -
       <dependency>
         <groupId>avalon</groupId>
         <artifactId>avalon-meta-spi</artifactId>
  @@ -48,12 +47,33 @@
   
       <dependency>
         <groupId>avalon</groupId>
  -      <artifactId>avalon-assembly</artifactId>
  +      <artifactId>avalon-composition-spi</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon</groupId>
  +      <artifactId>avalon-composition</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +
  +    <dependency>
  +      <groupId>avalon-extension</groupId>
  +      <artifactId>avalon-extension-spi</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon-extension</groupId>
  +      <artifactId>avalon-extension-impl</artifactId>
         <version>1.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon</groupId>
  +      <artifactId>avalon-assembly</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon</groupId>
         <artifactId>avalon-assembly-spi</artifactId>
         <version>1.0</version>
       </dependency>
  @@ -92,17 +112,6 @@
         <version>1.1-dev</version>
       </dependency>
       
  -    <dependency>
  -      <groupId>avalon-extension</groupId>
  -      <artifactId>avalon-extension-spi</artifactId>
  -      <version>1.0</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>avalon-extension</groupId>
  -      <artifactId>avalon-extension-impl</artifactId>
  -      <version>1.0</version>
  -    </dependency>
  -
       <!-- merlin -->
   
       <dependency>
  
  
  

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