mcconnell 2003/07/10 17:36:55
Modified: merlin/assembly project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
DefaultApplianceContext.java
merlin/assembly-spi project.xml
merlin/composition project.xml
merlin/composition-spi project.xml
merlin/merlin-core project.xml
merlin/merlin-platform project.xml
merlin/merlin-plugin plugin.jelly project.xml
merlin/merlin-spi project.xml
merlin/meta project.xml
merlin/meta-spi project.xml
Log:
Synchronization with external Avalon Meta package.
Revision Changes Path
1.14 +15 -0 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 4 Jul 2003 07:31:22 -0000 1.13
+++ project.xml 11 Jul 2003 00:36:54 -0000 1.14
@@ -28,6 +28,21 @@
<artifactId>avalon-framework-impl</artifactId>
<version>4.1.5-dev</version>
</dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<id>logkit</id>
1.7 +3 -3
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceContext.java
Index: DefaultApplianceContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultApplianceContext.java 19 Jun 2003 11:23:22 -0000 1.6
+++ DefaultApplianceContext.java 11 Jul 2003 00:36:54 -0000 1.7
@@ -58,7 +58,7 @@
import org.apache.avalon.assembly.locator.impl.DefaultLocator;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.meta.model.Category;
import org.apache.avalon.meta.model.ContextDirective;
@@ -484,7 +484,7 @@
private LoggingDirective buildLoggingDirectives( LoggingDirective directive )
{
LoggingDirective categories = m_profile.getCategories();
- LoggerDescriptor[] loggers = m_profile.getType().getLoggers();
+ CategoryDescriptor[] loggers = m_profile.getType().getCategories();
ArrayList list = new ArrayList();
for( int i = 0; i < loggers.length; i++ )
1.6 +5 -0 avalon-sandbox/merlin/assembly-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 4 Jul 2003 07:31:58 -0000 1.5
+++ project.xml 11 Jul 2003 00:36:54 -0000 1.6
@@ -23,6 +23,11 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5-dev</version>
</dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>avalon</groupId>
1.2 +16 -1 avalon-sandbox/merlin/composition/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 4 Jul 2003 07:27:32 -0000 1.1
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.2
@@ -23,12 +23,27 @@
<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-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
<dependency>
<id>logkit</id>
1.2 +11 -0 avalon-sandbox/merlin/composition-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition-spi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 4 Jul 2003 07:28:18 -0000 1.1
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.2
@@ -25,6 +25,17 @@
</dependency>
<dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
1.13 +15 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 4 Jul 2003 07:32:36 -0000 1.12
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.13
@@ -39,6 +39,21 @@
<artifactId>avalon-assembly</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>avalon</groupId>
1.9 +21 -0 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 9 Jul 2003 05:02:06 -0000 1.8
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.9
@@ -26,6 +26,27 @@
</dependency>
<dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-tools</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon</groupId>
<artifactId>avalon-activation-spi</artifactId>
<version>1.0</version>
1.16 +4 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 4 Jul 2003 07:33:13 -0000 1.15
+++ plugin.jelly 11 Jul 2003 00:36:55 -0000 1.16
@@ -20,9 +20,10 @@
<pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
<pathelement
path="${plugin.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
<pathelement
path="${plugin.getDependencyPath('avalon-framework:avalon-framework-impl')}"/>
- <pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-tools')}"/>
- <pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-spi')}"/>
- <pathelement path="${plugin.getDependencyPath('avalon:avalon-meta')}"/>
+ <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-meta-tools')}"/>
+ <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-meta-api')}"/>
+ <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-meta-spi')}"/>
+ <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-meta-impl')}"/>
</classpath>
</ant:taskdef>
1.9 +31 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 4 Jul 2003 07:33:13 -0000 1.8
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.9
@@ -17,12 +17,26 @@
<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-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<id>logkit</id>
@@ -43,6 +57,22 @@
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-spi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
1.9 +5 -0 avalon-sandbox/merlin/merlin-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 30 Jun 2003 21:09:30 -0000 1.8
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.9
@@ -23,6 +23,11 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5-dev</version>
</dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>avalon</groupId>
1.10 +1 -3 avalon-sandbox/merlin/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 10 Jul 2003 23:15:13 -0000 1.9
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.10
@@ -40,16 +40,14 @@
<artifactId>avalon-meta-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
<version>SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>avalon-meta</groupId>
- <artifactId>avalon-meta</artifactId>
+ <artifactId>avalon-meta-impl</artifactId>
<version>SNAPSHOT</version>
</dependency>
1.6 +10 -0 avalon-sandbox/merlin/meta-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 4 Jul 2003 09:02:01 -0000 1.5
+++ project.xml 11 Jul 2003 00:36:55 -0000 1.6
@@ -21,6 +21,16 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.1.5-dev</version>
</dependency>
+ <dependency>
+ <groupId>avalon-meta</groupId>
+ <artifactId>avalon-meta-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency> <!-- testing -->
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
+ </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
