You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/07/04 09:32:36 UTC
cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl DefaultKernel.java
mcconnell 2003/07/04 00:32:36
Modified: merlin/merlin-core project.xml
merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
StandardBlockLoader.java XMLContainerCreator.java
merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernel.java
Log:
Synchronization with the introduction of the composition package.
Revision Changes Path
1.12 +35 -27 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 1 Jul 2003 14:12:45 -0000 1.11
+++ project.xml 4 Jul 2003 07:32:36 -0000 1.12
@@ -30,20 +30,36 @@
<!-- avalon dependecies -->
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-assembly-spi</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-assembly</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-composition-spi</artifactId>
+ <version>1.0</version>
</dependency>
-
<dependency>
- <id>logkit</id>
- <version>1.2</version>
+ <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>
@@ -51,7 +67,6 @@
<artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
</dependency>
-
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta</artifactId>
@@ -59,15 +74,19 @@
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-assembly-spi</artifactId>
- <version>1.0</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-assembly</artifactId>
- <version>1.0</version>
+ <id>logkit</id>
+ <version>1.2</version>
</dependency>
<!-- excalibur depedencies -->
@@ -99,17 +118,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>
-
<dependency>
<id>commons-collections</id>
<version>2.1</version>
1.17 +2 -2 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java
Index: StandardBlockLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardBlockLoader.java 22 Jun 2003 13:57:56 -0000 1.16
+++ StandardBlockLoader.java 4 Jul 2003 07:32:36 -0000 1.17
@@ -74,7 +74,7 @@
import org.apache.avalon.assembly.locator.Locator;
import org.apache.avalon.assembly.locator.impl.DefaultLocator;
import org.apache.avalon.assembly.logging.LoggingManager;
-import org.apache.avalon.assembly.repository.Repository;
+import org.apache.avalon.composition.repository.Repository;
import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
1.8 +2 -2 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/XMLContainerCreator.java
Index: XMLContainerCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/XMLContainerCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLContainerCreator.java 3 Jul 2003 19:05:01 -0000 1.7
+++ XMLContainerCreator.java 4 Jul 2003 07:32:36 -0000 1.8
@@ -72,7 +72,7 @@
import org.apache.avalon.assembly.engine.model.IncludeDescriptor;
import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
import org.apache.avalon.assembly.engine.type.UnknownTypeException;
-import org.apache.avalon.assembly.repository.Repository;
+import org.apache.avalon.composition.repository.Repository;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
1.26 +3 -3 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultKernel.java 27 Jun 2003 22:54:18 -0000 1.25
+++ DefaultKernel.java 4 Jul 2003 07:32:36 -0000 1.26
@@ -67,8 +67,8 @@
import org.apache.avalon.assembly.logging.LoggingDescriptor;
import org.apache.avalon.assembly.logging.TargetDescriptor;
import org.apache.avalon.assembly.logging.TargetProvider;
-import org.apache.avalon.assembly.repository.Repository;
-import org.apache.avalon.assembly.repository.impl.FileRepository;
+import org.apache.avalon.composition.repository.Repository;
+import org.apache.avalon.composition.repository.impl.FileRepository;
import org.apache.avalon.assembly.util.ExceptionHelper;
import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.activity.Initializable;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org