mcconnell 2003/06/19 22:25:27
Modified: merlin maven.xml
merlin/assembly project.xml
merlin/assembly-spi project.xml
merlin/merlin-cli project.xml
merlin/merlin-core project.xml
merlin/merlin-extensions/merlin-servlet project.xml
merlin/merlin-platform project.xml
merlin/merlin-platform/examples/afs/simple project.xml
merlin/merlin-platform/examples/afs/simple-servlet
project.xml
merlin/merlin-platform/tutorials/configuration/block
project.xml
merlin/merlin-platform/tutorials/configuration/defaults
project.xml
merlin/merlin-platform/tutorials/configuration/override
project.xml
merlin/merlin-platform/tutorials/configuration/simple
project.xml
merlin/merlin-platform/tutorials/dependencies project.xml
merlin/merlin-platform/tutorials/meta project.xml
merlin/merlin-plugin project.xml
merlin/merlin-spi project.xml
merlin/meta project.xml
merlin/meta/src/java/org/apache/avalon/meta/model/builder
XMLProfileCreator.java
merlin/meta-spi project.xml
merlin/meta-spi/src/java/org/apache/avalon/meta/model
Profile.java
merlin/meta-tools project.xml
Log:
Rollup from framework 4.1.4 to 4.1.5-dev. This will for effective progrress on the
internal classloading management within the Merlin containment environment.
Revision Changes Path
1.15 +1 -1 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 15 Jun 2003 18:30:50 -0000 1.14
+++ maven.xml 20 Jun 2003 05:25:25 -0000 1.15
@@ -55,7 +55,7 @@
<move toDir="${merlin.build.inst.dir}/lib/shared">
<fileset dir="${merlin.build.inst.dir}/lib/system">
- <include name="avalon-framework-*.jar"/>
+ <include name="*-api-*.jar"/>
<include name="*-spi-*.jar"/>
</fileset>
</move>
1.9 +10 -2 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 15 Jun 2003 18:30:50 -0000 1.8
+++ project.xml 20 Jun 2003 05:25:25 -0000 1.9
@@ -19,9 +19,17 @@
<!-- avalon dependecies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
<id>logkit</id>
<version>1.2</version>
1.4 +3 -16 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 15 Jun 2003 18:30:50 -0000 1.3
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.4
@@ -19,28 +19,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
- </dependency>
-
- <!-- pre JDK 1.4 dependencies -->
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
- <dependency>
- <id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
</dependencies>
1.7 +0 -14 avalon-sandbox/merlin/merlin-cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 15 Jun 2003 18:30:50 -0000 1.6
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.7
@@ -28,20 +28,6 @@
<version>1.0</version>
</dependency>
- <!-- pre JDK 1.4 dependencies -->
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
- <dependency>
- <id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
</dependencies>
<build>
1.8 +29 -35 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 15 Jun 2003 18:30:50 -0000 1.7
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.8
@@ -16,52 +16,45 @@
<description>
An advanced service management platform.
</description>
-
- <packageGroups>
- <packageGroup>
- <title>Block</title>
-
<packages>org.apache.avalon.merlin.block,org.apache.avalon.merlin.block.*</packages>
- </packageGroup>
- <packageGroup>
- <title>Container</title>
-
<packages>org.apache.avalon.merlin.container,org.apache.avalon.merlin.container.*</packages>
- </packageGroup>
- <packageGroup>
- <title>Kernel</title>
-
<packages>org.apache.avalon.merlin.kernel,org.apache.avalon.merlin.kernel.*</packages>
- </packageGroup>
- <packageGroup>
- <title>Utilities</title>
- <packages>org.apache.avalon.merlin.service</packages>
- </packageGroup>
- </packageGroups>
-
- <dependencies>
+ <dependencies>
+
+ <!-- merlin dependecies -->
+
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>merlin</groupId>
+ <artifactId>merlin-spi</artifactId>
+ <version>1.0</version>
</dependency>
+ <!-- avalon dependecies -->
+
<dependency>
- <id>logkit</id>
- <version>1.2</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
<dependency>
- <id>excalibur-lifecycle</id>
- <version>1.0</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
<dependency>
+ <id>logkit</id>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon</groupId>
- <artifactId>avalon-meta</artifactId>
+ <artifactId>avalon-meta-spi</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>avalon</groupId>
- <artifactId>avalon-meta-spi</artifactId>
+ <artifactId>avalon-meta</artifactId>
<version>1.0</version>
</dependency>
@@ -80,6 +73,11 @@
<!-- excalibur depedencies -->
<dependency>
+ <id>excalibur-lifecycle</id>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
<id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
@@ -107,15 +105,11 @@
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-spi</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<id>commons-collections</id>
<version>2.1</version>
</dependency>
+
+ <!-- commons dependencies -->
<dependency>
<id>commons-cli</id>
1.3 +12 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.3
@@ -23,8 +23,18 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
@@ -48,8 +58,6 @@
<version>2.2.1</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
-
- <!-- unit test -->
<dependency>
<id>logkit</id>
1.3 +14 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.3
@@ -12,22 +12,31 @@
<dependencies>
- <!-- avalon dependencies -->
+ <!-- avalon dependecies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
+
<dependency>
- <id>excalibur-lifecycle</id>
- <version>1.0</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
+
<dependency>
<id>logkit</id>
<version>1.2</version>
</dependency>
<!-- excalibur dependencies -->
+
+ <dependency>
+ <id>excalibur-lifecycle</id>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>excalibur</groupId>
1.3 +9 -2
avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.3
@@ -23,8 +23,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
<!-- pre JDK 1.4 dependencies -->
1.3 +12 -2
avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.3
@@ -41,8 +41,18 @@
</dependency>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
1.3 +8 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.3
@@ -13,8 +13,14 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
</dependencies>
1.3 +9 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:26 -0000 1.3
@@ -13,8 +13,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
</dependencies>
1.3 +9 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:50 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.3
@@ -13,8 +13,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
</dependencies>
1.3 +9 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:51 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.3
@@ -13,8 +13,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
</dependencies>
1.2 +9 -2
avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 18 Jun 2003 11:21:33 -0000 1.1
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.2
@@ -13,8 +13,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
</dependencies>
1.3 +9 -2 avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jun 2003 18:30:51 -0000 1.2
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.3
@@ -25,8 +25,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
</dependencies>
1.5 +9 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 15 Jun 2003 18:30:51 -0000 1.4
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.5
@@ -13,8 +13,15 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
1.7 +5 -38 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 15 Jun 2003 18:30:51 -0000 1.6
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.7
@@ -12,37 +12,18 @@
<currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Service Provider Interface</shortDescription>
-
<description>
Client API to the Merlin Service Management Platform.
</description>
-
- <packageGroups>
- <packageGroup>
- <title>Block</title>
-
<packages>org.apache.avalon.merlin.block,org.apache.avalon.merlin.block.*</packages>
- </packageGroup>
- <packageGroup>
- <title>Container</title>
-
<packages>org.apache.avalon.merlin.container,org.apache.avalon.merlin.container.*</packages>
- </packageGroup>
- <packageGroup>
- <title>Kernel</title>
-
<packages>org.apache.avalon.merlin.kernel,org.apache.avalon.merlin.kernel.*</packages>
- </packageGroup>
- <packageGroup>
- <title>Utilities</title>
- <packages>org.apache.avalon.merlin.service</packages>
- </packageGroup>
- </packageGroups>
-
+
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
-
+
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
@@ -55,20 +36,6 @@
<version>1.0</version>
</dependency>
- <!-- pre JDK 1.4 dependencies -->
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
- <dependency>
- <id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
</dependencies>
</project>
1.5 +12 -11 avalon-sandbox/merlin/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 15 Jun 2003 18:30:51 -0000 1.4
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.5
@@ -15,19 +15,18 @@
Services supporting the creation of meta info and data data content based on XML
descriptors.
</description>
- <developers>
- <developer>
- <name>Stephen McConnell</name>
- <id>mcconnell</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>OSM SARL</organization>
- </developer>
- </developers>
-
<dependencies>
+
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</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>
@@ -40,6 +39,7 @@
<id>excalibur-i18n</id>
<version>1.0</version>
</dependency>
+
<dependency>
<id>excalibur-configuration</id>
<version>1.0</version>
@@ -52,6 +52,7 @@
<version>1.0.b2</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
+
<dependency>
<id>xerces</id>
<version>2.2.1</version>
1.8 +30 -6
avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java
Index: XMLProfileCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLProfileCreator.java 18 Jun 2003 11:23:50 -0000 1.7
+++ XMLProfileCreator.java 20 Jun 2003 05:25:27 -0000 1.8
@@ -265,16 +265,39 @@
final ContextDirective contextDirective =
createContextDirective( config.getChild( "context" ) );
- Configuration configuration = null;
- if( custom == null )
+ Configuration configuration = type.getConfiguration();
+ if( configuration != null )
{
- configuration = config.getChild( "configuration" );
+ if( config.getChild( "configuration", false ) != null )
+ {
+ configuration =
+ new CascadingConfiguration(
+ config.getChild( "configuration" ), configuration );
+ }
}
else
{
+ configuration = config.getChild( "configuration", false );
+ }
+
+ if( custom != null )
+ {
+ if( configuration != null )
+ {
+ configuration =
+ new CascadingConfiguration(
+ custom, configuration );
+ }
+ else
+ {
+ configuration = custom;
+ }
+ }
+
+ if( configuration == null )
+ {
configuration =
- new CascadingConfiguration(
- custom, config.getChild( "configuration" ) );
+ new DefaultConfiguration( "configuration", "XMLProfileCreator.class"
);
}
//
@@ -306,6 +329,7 @@
throw new ModelRuntimeException( error, e );
}
}
+
/**
* Get the activation policy from a configuration. If no activation attribute
1.4 +3 -36 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 15 Jun 2003 18:30:51 -0000 1.3
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.4
@@ -17,43 +17,10 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
- <dependency>
- <id>excalibur-i18n</id>
- <version>1.0</version>
- </dependency>
- <dependency>
- <id>excalibur-configuration</id>
- <version>1.0</version>
- </dependency>
-
- <!-- pre JDK 1.4 dependencies -->
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
- <dependency>
- <id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
</dependencies>
- <packageGroups>
- <packageGroup>
- <title>Meta Model</title>
- <packages>org.apache.avalon.meta.info,org.apache.avalon.meta.model</packages>
- </packageGroup>
- <packageGroup>
- <title>Utilities</title>
- <packages>org.apache.avalon.meta</packages>
- </packageGroup>
- </packageGroups>
-
</project>
1.8 +5 -40
avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java
Index: Profile.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Profile.java 18 Jun 2003 11:24:41 -0000 1.7
+++ Profile.java 20 Jun 2003 05:25:27 -0000 1.8
@@ -53,7 +53,6 @@
import java.io.Serializable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -62,8 +61,6 @@
import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.Type;
-import org.apache.excalibur.configuration.CascadingConfiguration;
-import org.apache.excalibur.configuration.ConfigurationUtil;
/**
* Definition of the criteria for an explicit component profile. A profile, when
@@ -325,6 +322,7 @@
* Provide a textual report on the profile.
* @return the formatted profile report
*/
+ /*
public String list()
{
StringBuffer buffer = new StringBuffer();
@@ -346,6 +344,7 @@
buffer.append( "\n\n" );
return buffer.toString();
}
+ */
private void setActivationPolicy( Context context )
{
@@ -409,43 +408,9 @@
}
}
- private void setConfiguration( Context context )
+ private void setConfiguration( Context context ) throws ContextException
{
- try
- {
- Configuration config =
+ m_configuration =
(Configuration) context.get( CONFIGURATION_KEY );
- Configuration parent = m_type.getConfiguration();
-
- if( parent != null )
- {
- if( config != null )
- {
- m_configuration =
- new CascadingConfiguration( config, parent );
- }
- else
- {
- m_configuration = parent;
- }
- }
- else
- {
- m_configuration = config;
- }
- }
- catch( ContextException e )
- {
- Configuration config = m_type.getConfiguration();
- if( config != null )
- {
- m_configuration = config;
- }
- else
- {
- m_configuration =
- new DefaultConfiguration( "configuration", "Profile.class" );
- }
- }
}
}
1.4 +9 -5 avalon-sandbox/merlin/meta-tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 15 Jun 2003 18:30:51 -0000 1.3
+++ project.xml 20 Jun 2003 05:25:27 -0000 1.4
@@ -25,15 +25,19 @@
</developers>
<dependencies>
-
+
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
+
<dependency>
- <id>excalibur-i18n</id>
- <version>1.0</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5-dev</version>
</dependency>
+
<dependency>
<id>excalibur-configuration</id>
<version>1.0</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
