mcconnell 2004/02/04 10:15:15
Modified: merlin/activation/impl project.xml
merlin/activation/spi project.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/spi project.xml
merlin/facilities/http/listener project.xml
merlin/kernel/impl project.xml
Removed: merlin/extension/impl .cvsignore project.properties
project.xml
merlin/extension/impl/src/java/org/apache/avalon/extension/manager/impl
DefaultExtensionManager.java
DelegatingExtensionManager.java
NoopExtensionManager.java
OptionalPackageComparator.java package.html
merlin/extension/impl/src/test/org/apache/avalon/extension/manager/impl/test
ComparatorTestCase.java TestExtensionManager.java
merlin/extension/impl/src/test/org/apache/avalon/extension/test
DeweyDecimalTestCase.java ExtensionTestCase.java
PackageRepositoryTestCase.java
SpecificationTestCase.java manifest-1.mf
manifest-2.mf manifest-3.mf manifest-4.mf
manifest-5.mf manifest-6.mf manifest-7.mf
manifest-8.mf manifest-9.mf manifest-quoted.mf
specification-1.mf specification-2.mf
specification-3.mf specification-4.mf
specification-5.mf specification-6.mf
specification-7.mf specification-8.mf
specification-9.mf
merlin/extension/impl/src/test/org/apache/avalon/extension/test/path1
ajar-1.jar ajar-2.jar ajar-3.jar ajar-4.jar
merlin/extension/impl/src/test/org/apache/avalon/extension/test/path2
ajar-5.jar ajar-6.jar ajar-7.jar ajar-8.jar
merlin/extension/spi .cvsignore project.xml
merlin/extension/spi/src/java/org/apache/avalon/extension
Compatability.java DeweyDecimal.java Extension.java
Specification.java package.html
merlin/extension/spi/src/java/org/apache/avalon/extension/manager
ExtensionManager.java OptionalPackage.java
PackageManager.java
UnsatisfiedExtensionException.java package.html
Log:
Remove optional extension facilities (content available under avalon util extension)
and update project dependencies accordingly.
Revision Changes Path
1.16 +4 -4 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 24 Jan 2004 23:25:21 -0000 1.15
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.16
@@ -73,13 +73,13 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-impl</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-impl</artifactId>
<version>1.1</version>
</dependency>
1.13 +2 -2 avalon/merlin/activation/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 24 Jan 2004 23:25:23 -0000 1.12
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.13
@@ -57,8 +57,8 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
</dependency>
1.12 +2 -2 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 24 Jan 2004 23:25:23 -0000 1.11
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.12
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
</dependency>
1.15 +4 -4 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 24 Jan 2004 23:25:27 -0000 1.14
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.15
@@ -68,13 +68,13 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-impl</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-impl</artifactId>
<version>1.1</version>
</dependency>
1.12 +2 -2 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 13 Jan 2004 11:41:27 -0000 1.11
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.12
@@ -26,8 +26,8 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
</dependency>
1.3 +2 -2 avalon/merlin/facilities/http/listener/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/listener/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 2 Feb 2004 11:31:37 -0000 1.2
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.3
@@ -37,8 +37,8 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
</dependency>
1.21 +4 -4 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 2 Feb 2004 11:31:37 -0000 1.20
+++ project.xml 4 Feb 2004 18:15:14 -0000 1.21
@@ -125,16 +125,16 @@
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
<version>1.1</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-impl</artifactId>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-impl</artifactId>
<version>1.1</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
