avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-plugin project.xml
Date Mon, 23 Jun 2003 02:37:49 GMT
mcconnell    2003/06/22 19:37:49

  Modified:    merlin/assembly project.xml
               merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
                        EngineClassLoader.java
               merlin/merlin-core project.xml
               merlin/merlin-extensions/merlin-servlet project.xml
               merlin/merlin-platform project.xml
               merlin/merlin-plugin project.xml
  Removed:     merlin/extension-api .cvsignore project.xml
               merlin/extension-api/src/java/org/apache/avalon/extension
                        Compatability.java DeweyDecimal.java Extension.java
                        Specification.java
               merlin/extension-api/src/java/org/apache/avalon/extension/manager
                        ExtensionManager.java OptionalPackage.java
                        PackageManager.java
                        UnsatisfiedExtensionException.java
  Log:
  sync. with extensions
  
  Revision  Changes    Path
  1.10      +7 -1      avalon-sandbox/merlin/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	20 Jun 2003 05:25:25 -0000	1.9
  +++ project.xml	23 Jun 2003 02:37:49 -0000	1.10
  @@ -72,7 +72,13 @@
         <version>1.0</version>
       </dependency>
       <dependency>
  -      <id>excalibur-extension</id>
  +      <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>
  
  
  
  1.10      +7 -7      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java
  
  Index: EngineClassLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EngineClassLoader.java	19 Jun 2003 11:27:10 -0000	1.9
  +++ EngineClassLoader.java	23 Jun 2003 02:37:49 -0000	1.10
  @@ -86,14 +86,14 @@
   import org.apache.avalon.assembly.logging.LoggingManager;
   import org.apache.avalon.assembly.repository.Repository;
   import org.apache.avalon.assembly.repository.impl.FileRepository;
  -import org.apache.avalon.excalibur.extension.Extension;
  +import org.apache.avalon.extension.Extension;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.excalibur.packagemanager.ExtensionManager;
  -import org.apache.avalon.excalibur.packagemanager.OptionalPackage;
  -import org.apache.avalon.excalibur.packagemanager.PackageManager;
  -import org.apache.avalon.excalibur.packagemanager.impl.DefaultExtensionManager;
  -import org.apache.avalon.excalibur.packagemanager.impl.DelegatingExtensionManager;
  +import org.apache.avalon.extension.manager.ExtensionManager;
  +import org.apache.avalon.extension.manager.OptionalPackage;
  +import org.apache.avalon.extension.manager.PackageManager;
  +import org.apache.avalon.extension.manager.impl.DefaultExtensionManager;
  +import org.apache.avalon.extension.manager.impl.DelegatingExtensionManager;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.logger.LogEnabled;
  
  
  
  1.9       +7 -1      avalon-sandbox/merlin/merlin-core/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	20 Jun 2003 05:25:26 -0000	1.8
  +++ project.xml	23 Jun 2003 02:37:49 -0000	1.9
  @@ -100,7 +100,13 @@
       </dependency>
       
       <dependency>
  -      <id>excalibur-extension</id>
  +      <groupId>avalon-extension</groupId>
  +      <artifactId>avalon-extension-api</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon-extension</groupId>
  +      <artifactId>avalon-extension-impl</artifactId>
         <version>1.0</version>
       </dependency>
   
  
  
  
  1.4       +10 -1     avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	20 Jun 2003 05:25:26 -0000	1.3
  +++ project.xml	23 Jun 2003 02:37:49 -0000	1.4
  @@ -145,7 +145,16 @@
       </dependency>
       
       <dependency>
  -      <id>excalibur-extension</id>
  +      <groupId>avalon-extension</groupId>
  +      <artifactId>avalon-extension-spi</artifactId>
  +      <version>1.0</version>
  +      <properties>
  +        <war.bundle.jar>true</war.bundle.jar>
  +      </properties>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon-extension</groupId>
  +      <artifactId>avalon-extension-impl</artifactId>
         <version>1.0</version>
         <properties>
           <war.bundle.jar>true</war.bundle.jar>
  
  
  
  1.4       +7 -1      avalon-sandbox/merlin/merlin-platform/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	20 Jun 2003 05:25:26 -0000	1.3
  +++ project.xml	23 Jun 2003 02:37:49 -0000	1.4
  @@ -53,7 +53,13 @@
         <version>1.0</version>
       </dependency>
       <dependency>
  -      <id>excalibur-extension</id>
  +      <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>
  
  
  
  1.6       +7 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	20 Jun 2003 05:25:27 -0000	1.5
  +++ project.xml	23 Jun 2003 02:37:49 -0000	1.6
  @@ -93,7 +93,13 @@
       </dependency>
       
       <dependency>
  -      <id>excalibur-extension</id>
  +      <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>
   
  
  
  

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


Mime
View raw message