You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/02 17:57:14 UTC
cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder XMLContainerCreator.java
mcconnell 2003/04/02 07:57:14
Modified: merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder
XMLContainerCreator.java
Log:
Addition of support for the use of "container" in preference to "appliance".
Revision Changes Path
1.2 +18 -2 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java
Index: XMLContainerCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLContainerCreator.java 13 Mar 2003 01:05:08 -0000 1.1
+++ XMLContainerCreator.java 2 Apr 2003 15:57:14 -0000 1.2
@@ -225,7 +225,7 @@
throws Exception
{
ArrayList vector = new ArrayList();
- Configuration[] profiles = info.getChildren( "appliance" );
+ Configuration[] profiles = getComponentProfiles( info );
if( profiles.length == 0 )
{
ContainerDescriptor profile =
@@ -241,6 +241,22 @@
return (ContainerDescriptor[])vector.toArray(
(Object[]) Array.newInstance( m_clazz, 0 ) );
+ }
+
+ private Configuration[] getComponentProfiles( Configuration config )
+ {
+ ArrayList vector = new ArrayList();
+ Configuration[] profiles = config.getChildren( "appliance" );
+ for( int i = 0; i < profiles.length; i++ )
+ {
+ vector.add( profiles[ i ] );
+ }
+ profiles = config.getChildren( "component" );
+ for( int i = 0; i < profiles.length; i++ )
+ {
+ vector.add( profiles[ i ] );
+ }
+ return (Configuration[]) vector.toArray( new Configuration[0] );
}
private ContainerDescriptor createImplicitContainerDescriptor( Type type )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org