mcconnell 2003/07/12 14:10:46
Modified: merlin/assembly project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
DefaultTypeRepository.java
merlin/assembly-spi project.xml
merlin/composition project.xml
merlin/composition/src/java/org/apache/avalon/composition/model/impl
DefaultTypeRepository.java Scanner.java
merlin/composition-spi project.xml
merlin/merlin-core project.xml
merlin/merlin-platform project.xml
merlin/merlin-plugin project.xml
merlin/merlin-spi project.xml
merlin/meta project.xml
merlin/meta-spi project.xml
Log:
Update to SNAPSHOT version of framework and a number of small updates to sync. with
the Avalon Meta build.
Revision Changes Path
1.15 +2 -2 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 11 Jul 2003 00:36:54 -0000 1.14
+++ project.xml 12 Jul 2003 21:10:45 -0000 1.15
@@ -21,12 +21,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.5 +2 -2
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultTypeRepository.java
Index: DefaultTypeRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultTypeRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTypeRepository.java 20 Jun 2003 19:02:17 -0000 1.4
+++ DefaultTypeRepository.java 12 Jul 2003 21:10:45 -0000 1.5
@@ -161,7 +161,7 @@
try
{
- return DEFAULT_BUILDER.build( clazz.getName(), clazz.getClassLoader() );
+ return DEFAULT_BUILDER.buildType( clazz );
}
catch( Throwable e )
{
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 11 Jul 2003 00:36:54 -0000 1.6
+++ project.xml 12 Jul 2003 21:10:45 -0000 1.7
@@ -21,7 +21,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.3 +2 -2 avalon-sandbox/merlin/composition/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 11 Jul 2003 00:36:55 -0000 1.2
+++ project.xml 12 Jul 2003 21:10:45 -0000 1.3
@@ -21,12 +21,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.6 +2 -34
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
Index: DefaultTypeRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultTypeRepository.java 7 Jul 2003 08:31:18 -0000 1.5
+++ DefaultTypeRepository.java 12 Jul 2003 21:10:45 -0000 1.6
@@ -91,22 +91,7 @@
//==============================================================
private static final Resources REZ =
- ResourceManager.getPackageResources( DefaultClassLoaderModel.class );
-
- private static final Type NULL_TYPE;
-
- static
- {
- try
- {
- NULL_TYPE = new TypeBuilder().build( NullComponent.class );
- }
- catch( Throwable e )
- {
- throw new RuntimeException(
- REZ.getString( "type.repository.null-create.error", e.toString() ) );
- }
- }
+ ResourceManager.getPackageResources( DefaultClassLoaderModel.class );
/**
* The profile builder.
@@ -170,23 +155,6 @@
m_parent = parent;
m_classloader = classloader;
m_logger = logger;
-
- //
- // If the parent is null then we are root so we add the
- // NullComponent type as the default component type.
- //
-
- if( m_parent == null )
- {
- final String classname = NULL_TYPE.getInfo().getClassname();
- m_types.put( classname , NULL_TYPE );
- if( getLogger().isDebugEnabled() )
- {
- final String message =
- REZ.getString( "type.repository.bootstrap.error", classname );
- getLogger().debug( message );
- }
- }
//
// build up a map of types in the repository keyed by classname
1.7 +2 -2
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Scanner.java
Index: Scanner.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Scanner.java 8 Jul 2003 14:05:15 -0000 1.6
+++ Scanner.java 12 Jul 2003 21:10:45 -0000 1.7
@@ -393,7 +393,7 @@
throw new ModelException( error, cnfe );
}
- Type type = TYPE_BUILDER.build( clazz );
+ Type type = TYPE_BUILDER.buildType( clazz );
try
{
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 11 Jul 2003 00:36:55 -0000 1.2
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.3
@@ -21,7 +21,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
1.14 +2 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 11 Jul 2003 00:36:55 -0000 1.13
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.14
@@ -91,12 +91,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
1.10 +2 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 11 Jul 2003 00:36:55 -0000 1.9
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.10
@@ -17,12 +17,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
1.10 +2 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 11 Jul 2003 00:36:55 -0000 1.9
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.10
@@ -15,12 +15,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 11 Jul 2003 00:36:55 -0000 1.9
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.10
@@ -21,7 +21,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.11 +2 -2 avalon-sandbox/merlin/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 11 Jul 2003 00:36:55 -0000 1.10
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.11
@@ -20,13 +20,13 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 11 Jul 2003 00:36:55 -0000 1.6
+++ project.xml 12 Jul 2003 21:10:46 -0000 1.7
@@ -19,7 +19,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
