CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/verifier AssemblyVerifier.java,1.2,1.3 SarVerifier.java,1.2,1.3
Peter Donald <pdonald-yCVjj/[email protected]> Mon, 3 Nov 2003 00:43:20 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/verifier
In directory hogshead.codehaus.org:/tmp/cvs-serv22178/engine/src/java/org/jcontainer/loom/components/util/verifier
Modified Files:
AssemblyVerifier.java SarVerifier.java
Log Message:
Rename the MetaData away from standard MetaData postfix to use more readily accesisble names
Index: AssemblyVerifier.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/verifier/AssemblyVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AssemblyVerifier.java 26 Oct 2003 03:39:39 -0000 1.2
+++ AssemblyVerifier.java 3 Nov 2003 06:43:15 -0000 1.3
@@ -13,7 +13,7 @@
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.DependencyMetaData;
+import org.jcontainer.loom.components.util.metadata.DependencyDirective;
import org.jcontainer.loom.components.util.profile.ComponentProfile;
import org.realityforge.salt.i18n.ResourceManager;
import org.realityforge.salt.i18n.Resources;
@@ -142,7 +142,7 @@
final String trace = getDependencyTrace( dependency, stack );
final String message =
REZ.format( "assembly.circular-dependency.error",
- component.getMetaData().getName(),
+ component.getTemplate().getName(),
trace );
throw new Exception( message );
}
@@ -167,7 +167,7 @@
final StringBuffer sb = new StringBuffer();
sb.append( "[ " );
- final String name = component.getMetaData().getName();
+ final String name = component.getTemplate().getName();
final int size = stack.size();
final int top = size - 1;
for( int i = top; i >= 0; i-- )
@@ -177,9 +177,9 @@
{
sb.append( ", " );
}
- sb.append( other.getMetaData().getName() );
+ sb.append( other.getTemplate().getName() );
- if( other.getMetaData().getName().equals( name ) )
+ if( other.getTemplate().getName().equals( name ) )
{
break;
}
@@ -204,8 +204,8 @@
final ComponentProfile[] components )
{
final ArrayList dependencies = new ArrayList();
- final DependencyMetaData[] deps =
- component.getMetaData().getDependencies();
+ final DependencyDirective[] deps =
+ component.getTemplate().getDependencies();
for( int i = 0; i < deps.length; i++ )
{
@@ -244,11 +244,11 @@
throws Exception
{
final ComponentInfo info = component.getInfo();
- final DependencyMetaData[] dependencies = component.getMetaData().getDependencies();
+ final DependencyDirective[] dependencies = component.getTemplate().getDependencies();
for( int i = 0; i < dependencies.length; i++ )
{
- final DependencyMetaData dependency = dependencies[ i ];
+ final DependencyDirective dependency = dependencies[ i ];
final String providerName = dependency.getProviderName();
final String key = dependency.getKey();
final String type = info.getDependency( key ).getComponentType();
@@ -261,7 +261,7 @@
REZ.format( "assembly.missing-dependency.error",
key,
providerName,
- component.getMetaData().getName() );
+ component.getTemplate().getName() );
throw new Exception( message );
}
@@ -275,7 +275,7 @@
REZ.format( "assembly.dependency-missing-service.error",
providerName,
type,
- component.getMetaData().getName() );
+ component.getTemplate().getName() );
throw new Exception( message );
}
}
@@ -294,7 +294,7 @@
for( int i = 0; i < components.length; i++ )
{
ComponentProfile ComponentProfile = components[ i ];
- if( ComponentProfile.getMetaData().getName().equals( name ) )
+ if( ComponentProfile.getTemplate().getName().equals( name ) )
{
return components[ i ];
}
@@ -315,7 +315,7 @@
for( int i = 0; i < components.length; i++ )
{
ComponentProfile ComponentProfile = components[ i ];
- final String name = ComponentProfile.getMetaData().getName();
+ final String name = ComponentProfile.getTemplate().getName();
if( !isValidName( name ) )
{
final String message =
@@ -361,7 +361,7 @@
for( int i = 0; i < components.length; i++ )
{
ComponentProfile ComponentProfile = components[ i ];
- final String name = ComponentProfile.getMetaData().getName();
+ final String name = ComponentProfile.getTemplate().getName();
verifyUniqueName( components, name, i );
}
}
@@ -383,7 +383,7 @@
{
ComponentProfile ComponentProfile = components[ i ];
final String other =
- ComponentProfile.getMetaData().getName();
+ ComponentProfile.getTemplate().getName();
if( index != i && other.equals( name ) )
{
final String message =
@@ -394,7 +394,7 @@
}
/**
- * Retrieve a list of DependencyMetaData objects for ComponentProfile
+ * Retrieve a list of DependencyDirective objects for ComponentProfile
* and verify that there is a 1 to 1 map with dependencies specified
* in ComponentInfo.
*
@@ -405,8 +405,8 @@
throws Exception
{
//Make sure all dependency entries specified in config file are valid
- final DependencyMetaData[] dependencySet =
- component.getMetaData().getDependencies();
+ final DependencyDirective[] dependencySet =
+ component.getTemplate().getDependencies();
for( int i = 0; i < dependencySet.length; i++ )
{
@@ -422,7 +422,7 @@
REZ.format( "assembly.unknown-dependency.error",
key,
key,
- component.getMetaData().getName() );
+ component.getTemplate().getName() );
throw new Exception( message );
}
}
@@ -433,8 +433,8 @@
for( int i = 0; i < dependencies.length; i++ )
{
final DependencyDescriptor dependency = dependencies[ i ];
- final DependencyMetaData dependencyMetaData =
- component.getMetaData().getDependency( dependency.getKey() );
+ final DependencyDirective dependencyMetaData =
+ component.getTemplate().getDependency( dependency.getKey() );
//If there is no metaData then the user has failed
//to specify a needed dependency.
@@ -443,7 +443,7 @@
final String message =
REZ.format( "assembly.unspecified-dependency.error",
dependency.getKey(),
- component.getMetaData().getName() );
+ component.getTemplate().getName() );
throw new Exception( message );
}
}
Index: SarVerifier.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/verifier/SarVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SarVerifier.java 26 Oct 2003 03:39:39 -0000 1.2
+++ SarVerifier.java 3 Nov 2003 06:43:15 -0000 1.3
@@ -86,7 +86,7 @@
*/
package org.jcontainer.loom.components.util.verifier;
-import org.jcontainer.loom.components.util.metadata.ComponentMetaData;
+import org.jcontainer.loom.components.util.metadata.ComponentTemplate;
import org.jcontainer.loom.components.util.profile.ComponentProfile;
import org.jcontainer.loom.components.util.profile.PartitionProfile;
import org.jcontainer.loom.interfaces.ContainerConstants;
@@ -217,7 +217,7 @@
final ClassLoader classLoader )
throws Exception
{
- final ComponentMetaData metaData = block.getMetaData();
+ final ComponentTemplate metaData = block.getTemplate();
final Class clazz = loadClass( "block", metaData, classLoader );
m_infoVerifier.verifyType( metaData.getName(),
@@ -235,7 +235,7 @@
}
private Class loadClass( final String type,
- final ComponentMetaData metaData,
+ final ComponentTemplate metaData,
final ClassLoader classLoader )
throws Exception
{
@@ -282,7 +282,7 @@
final ClassLoader classLoader )
throws Exception
{
- final ComponentMetaData metaData = listener.getMetaData();
+ final ComponentTemplate metaData = listener.getTemplate();
final Class clazz = loadClass( "listener", metaData, classLoader );
if( !BLOCKLISTENER_CLASS.isAssignableFrom( clazz ) )
{
@@ -348,13 +348,13 @@
{
for( int i = 0; i < blocks.length; i++ )
{
- final String name = blocks[ i ].getMetaData().getName();
+ final String name = blocks[ i ].getTemplate().getName();
checkNameUnique( name, blocks, listeners, i, -1 );
}
for( int i = 0; i < listeners.length; i++ )
{
- final String name = listeners[ i ].getMetaData().getName();
+ final String name = listeners[ i ].getTemplate().getName();
checkNameUnique( name, blocks, listeners, -1, i );
}
}
@@ -382,7 +382,7 @@
//Verify no blocks have the same name
for( int i = 0; i < blocks.length; i++ )
{
- final String other = blocks[ i ].getMetaData().getName();
+ final String other = blocks[ i ].getTemplate().getName();
if( blockIndex != i && name.equals( other ) )
{
final String message = REZ.format( "duplicate-name", name );
@@ -393,7 +393,7 @@
//Verify no listeners have the same name
for( int i = 0; i < listeners.length; i++ )
{
- final String other = listeners[ i ].getMetaData().getName();
+ final String other = listeners[ i ].getTemplate().getName();
if( listenerIndex != i && name.equals( other ) )
{
final String message = REZ.format( "duplicate-name", name );