mcconnell 2003/07/04 00:31:23
Modified: merlin/assembly project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
DefaultClasspath.java EngineClassLoader.java
merlin/assembly/src/test/org/apache/avalon/assembly
TestBase.java
merlin/assembly/src/test/org/apache/avalon/assembly/engine
ApplianceTestCase.java
Removed: merlin/assembly maven.xml
merlin/assembly/src/java/org/apache/avalon/assembly/model
ClassLoaderModel.java CompositionModel.java
ContainmentModel.java DefaultTypeRepository.java
DeploymentModel.java Model.java ModelException.java
Resources.properties package.html
merlin/assembly/src/java/org/apache/avalon/assembly/repository/impl
DefaultAuthenticator.java FileRepository.java
HttpController.java package.html
merlin/assembly/src/test/conf block.xml classpath.xml
merlin/assembly/src/test/etc a.mf b.mf c.mf d.mf
merlin/assembly/src/test/org/apache/avalon/assembly/model
AbstractTestCase.java ClasspathTestCase.java
CompositionTestCase.java
merlin/assembly/src/test/org/apache/avalon/assembly/model/testa
A.java TestA.java TestA.xinfo
merlin/assembly/src/test/org/apache/avalon/assembly/model/testb
B.java TestB.java TestB.xinfo
merlin/assembly/src/test/org/apache/avalon/assembly/model/testc
C.java TestC.java TestC.xinfo
merlin/assembly/src/test/org/apache/avalon/assembly/model/testd
D.java TestD.java TestD.xinfo
merlin/assembly/src/test/org/apache/avalon/assembly/repository
LocalRepositoryTestCase.java
Log:
Initial seperation of composition semantics from assembly.
Revision Changes Path
1.13 +23 -11 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 3 Jul 2003 04:28:53 -0000 1.12
+++ project.xml 4 Jul 2003 07:31:22 -0000 1.13
@@ -23,7 +23,6 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5-dev</version>
</dependency>
-
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
@@ -40,6 +39,18 @@
<artifactId>avalon-assembly-spi</artifactId>
<version>1.0</version>
</dependency>
+
+ <dependency>
+ <groupId>avalon</groupId>
+ <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</groupId>
<artifactId>avalon-meta-spi</artifactId>
@@ -51,6 +62,17 @@
<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>
+
<!-- excalibur dependecies -->
<dependency>
@@ -70,16 +92,6 @@
<dependency>
<id>excalibur-configuration</id>
<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>excalibur-pool</id>
1.3 +3 -3
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultClasspath.java
Index: DefaultClasspath.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultClasspath.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultClasspath.java 1 Jul 2003 14:12:44 -0000 1.2
+++ DefaultClasspath.java 4 Jul 2003 07:31:22 -0000 1.3
@@ -66,8 +66,8 @@
import org.apache.avalon.assembly.engine.model.IncludeDescriptor;
import org.apache.avalon.assembly.engine.model.ResourceDescriptor;
import org.apache.avalon.assembly.engine.model.ClasspathRuntimeException;
-import org.apache.avalon.assembly.repository.Repository;
-import org.apache.avalon.assembly.repository.RepositoryException;
+import org.apache.avalon.composition.repository.Repository;
+import org.apache.avalon.composition.repository.RepositoryException;
/**
* <p>A classpath directive that describes a scoped set of jar files and
1.15 +2 -3
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- EngineClassLoader.java 3 Jul 2003 19:03:51 -0000 1.14
+++ EngineClassLoader.java 4 Jul 2003 07:31:22 -0000 1.15
@@ -84,8 +84,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.assembly.repository.impl.FileRepository;
+import org.apache.avalon.composition.repository.Repository;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.extension.Extension;
1.8 +2 -2
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/TestBase.java
Index: TestBase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/TestBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestBase.java 27 Jun 2003 22:52:12 -0000 1.7
+++ TestBase.java 4 Jul 2003 07:31:23 -0000 1.8
@@ -59,8 +59,8 @@
import org.apache.avalon.assembly.logging.LoggingDescriptor;
import org.apache.avalon.assembly.logging.LoggingManager;
import org.apache.avalon.assembly.logging.TargetDescriptor;
-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.logger.Logger;
import org.apache.avalon.framework.context.DefaultContext;
1.11 +2 -2
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java
Index: ApplianceTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplianceTestCase.java 27 Jun 2003 22:52:12 -0000 1.10
+++ ApplianceTestCase.java 4 Jul 2003 07:31:23 -0000 1.11
@@ -59,8 +59,8 @@
import org.apache.avalon.assembly.engine.impl.DefaultTypeRepository;
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.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.parameters.Parameters;
import org.apache.avalon.framework.context.DefaultContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
