CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/deployer DefaultDeployer.java,1.22,1.23 PhoenixProfileBuilder.java,1.16,1.17

Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/deployer
In directory hogshead.codehaus.org:/tmp/cvs-serv22178/engine/src/java/org/jcontainer/loom/components/deployer

Modified Files:
	DefaultDeployer.java PhoenixProfileBuilder.java 
Log Message:
Rename the MetaData away from standard MetaData postfix to use more readily accesisble names


Index: DefaultDeployer.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/deployer/DefaultDeployer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- DefaultDeployer.java	26 Oct 2003 08:11:31 -0000	1.22
+++ DefaultDeployer.java	3 Nov 2003 06:43:15 -0000	1.23
@@ -554,7 +554,7 @@
             {
                 final String message =
                     "Unable to validate configuration of component " +
-                    component.getMetaData().getName() + " of type " +
+                    component.getTemplate().getName() + " of type " +
                     component.getInfo().getType().getName();
                 throw new LoomException( message );
             }

Index: PhoenixProfileBuilder.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/deployer/PhoenixProfileBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- PhoenixProfileBuilder.java	3 Nov 2003 06:17:58 -0000	1.16
+++ PhoenixProfileBuilder.java	3 Nov 2003 06:43:15 -0000	1.17
@@ -15,8 +15,8 @@
 import org.jcontainer.loom.components.util.info.ComponentInfo;
 import org.jcontainer.loom.components.util.info.DependencyDescriptor;
 import org.jcontainer.loom.components.util.info.ServiceDescriptor;
-import org.jcontainer.loom.components.util.metadata.ComponentMetaData;
-import org.jcontainer.loom.components.util.metadata.PartitionMetaData;
+import org.jcontainer.loom.components.util.metadata.ComponentTemplate;
+import org.jcontainer.loom.components.util.metadata.PartitionTemplate;
 import org.jcontainer.loom.components.util.profile.ComponentProfile;
 import org.jcontainer.loom.components.util.profile.PartitionProfile;
 import org.jcontainer.loom.components.util.profile.ProfileBuilder;
@@ -35,7 +35,7 @@
     public PartitionProfile buildProfile( final Map parameters )
         throws Exception
     {
-        final PartitionMetaData metaData = m_assembler.buildAssembly( parameters );
+        final PartitionTemplate metaData = m_assembler.buildAssembly( parameters );
         final ClassLoader classLoader =
             (ClassLoader)parameters.get( ContainerConstants.ASSEMBLY_CLASSLOADER );
         final ComponentFactory factory = new DefaultComponentFactory( classLoader );
@@ -43,14 +43,14 @@
         return assembleSarProfile( metaData, factory, classLoader );
     }
 
-    private PartitionProfile assembleSarProfile( final PartitionMetaData metaData,
+    private PartitionProfile assembleSarProfile( final PartitionTemplate metaData,
                                                  final ComponentFactory factory,
                                                  final ClassLoader classLoader )
         throws Exception
     {
-        final PartitionMetaData blockPartition =
+        final PartitionTemplate blockPartition =
             metaData.getPartition( ContainerConstants.BLOCK_PARTITION );
-        final PartitionMetaData listenerPartition =
+        final PartitionTemplate listenerPartition =
             metaData.getPartition( ContainerConstants.LISTENER_PARTITION );
 
         final PartitionProfile blockProfile = assembleProfile( blockPartition, factory );
@@ -63,15 +63,15 @@
                                      ComponentProfile.EMPTY_SET );
     }
 
-    private PartitionProfile assembleListenerProfile( final PartitionMetaData metaData,
+    private PartitionProfile assembleListenerProfile( final PartitionTemplate metaData,
                                                       final ClassLoader classLoader )
     throws Exception
     {
         final ArrayList componentSet = new ArrayList();
-        final ComponentMetaData[] components = metaData.getComponents();
+        final ComponentTemplate[] components = metaData.getComponents();
         for( int i = 0; i < components.length; i++ )
         {
-            final ComponentMetaData component = components[ i ];
+            final ComponentTemplate component = components[ i ];
             final Class type = classLoader.loadClass( component.getImplementationKey() );
             final ComponentInfo info = createListenerInfo( type );
             final ComponentProfile profile = new ComponentProfile( info, component );
@@ -83,24 +83,24 @@
         return new PartitionProfile( metaData, PartitionProfile.EMPTY_SET, profiles );
     }
 
-    private PartitionProfile assembleProfile( final PartitionMetaData metaData,
+    private PartitionProfile assembleProfile( final PartitionTemplate metaData,
                                               final ComponentFactory factory )
         throws Exception
     {
         final ArrayList partitionSet = new ArrayList();
-        final PartitionMetaData[] partitions = metaData.getPartitions();
+        final PartitionTemplate[] partitions = metaData.getPartitions();
         for( int i = 0; i < partitions.length; i++ )
         {
-            final PartitionMetaData partition = partitions[ i ];
+            final PartitionTemplate partition = partitions[ i ];
             final PartitionProfile profile = assembleProfile( partition, factory );
             partitionSet.add( profile );
         }
 
         final ArrayList componentSet = new ArrayList();
-        final ComponentMetaData[] components = metaData.getComponents();
+        final ComponentTemplate[] components = metaData.getComponents();
         for( int i = 0; i < components.length; i++ )
         {
-            final ComponentMetaData component = components[ i ];
+            final ComponentTemplate component = components[ i ];
             final ComponentInfo info =
                 factory.createInfo( component.getImplementationKey() );
             final ComponentProfile profile = new ComponentProfile( info, component );