mcconnell 2002/07/05 02:30:07
Modified: assembly build.xml
assembly/src/java/org/apache/excalibur/merlin/registry
DefaultRegistry.java ServiceRegistry.java
Log:
more cleaning up to get closer to a core meta model
Revision Changes Path
1.8 +20 -2 jakarta-avalon-excalibur/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 4 Jul 2002 09:01:31 -0000 1.7
+++ build.xml 5 Jul 2002 09:30:06 -0000 1.8
@@ -198,10 +198,28 @@
</target>
<target name="patch">
- <replace token="org.apache.excalibur" value="org.apache.excalibur" dir=".">
+ <replace token="org.apache.excalibur.containerkit.metainfo"
value="org.apache.excalibur.meta.info" dir="src/java">
<include name="**/*.*"/>
</replace>
- <replace token="net/osm" value="net/osm" dir=".">
+ <replace token="org.apache.excalibur.containerkit.metadata"
value="org.apache.excalibur.meta.data" dir="src/java">
+ <include name="**/*.*"/>
+ </replace>
+ <replace token="org.apache.excalibur.containerkit.verifier"
value="org.apache.excalibur.meta.verifier" dir="src/java">
+ <include name="**/*.*"/>
+ </replace>
+ <replace token="org.apache.excalibur.containerkit.infobuilder"
value="org.apache.excalibur.meta.builder" dir="src/java">
+ <include name="**/*.*"/>
+ </replace>
+ <replace token=".getComponentInfo" value=".getInfo" dir="src/java">
+ <include name="**/*.*"/>
+ </replace>
+ <replace token="DependencyMetaData" value="Assignment" dir="src/java">
+ <include name="**/*.*"/>
+ </replace>
+ <replace token="org.apache.excalibur.containerkit.dependency.DependencyMap"
value="org.apache.excalibur.merlin.kernel.Map" dir="src/java">
+ <include name="**/*.*"/>
+ </replace>
+ <replace token="DependencyMap" value="Map" dir="src/java">
<include name="**/*.*"/>
</replace>
1.11 +12 -59
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/DefaultRegistry.java
Index: DefaultRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/DefaultRegistry.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultRegistry.java 5 Jul 2002 08:50:24 -0000 1.10
+++ DefaultRegistry.java 5 Jul 2002 09:30:07 -0000 1.11
@@ -86,7 +86,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>
* @version $Revision$ $Date$
*/
-public class DefaultRegistry implements LogEnabled, Contextualizable, Configurable,
Initializable, Executable, Disposable, Registry, Verifiable
+public class DefaultRegistry extends AbstractLogEnabled implements
Contextualizable, Configurable, Initializable, Executable, Disposable, Registry,
Verifiable
{
//=======================================================================
// static
@@ -122,65 +122,29 @@
private Container m_parent;
/**
- * The context argument supplied by the container.
+ * Classloader supplied by the parent.
*/
- private Context m_context;
-
- /**
- * The list of all ComponentDefinition instances keyed by classname.
- */
- private Hashtable m_componentRegistry = new Hashtable();
+ private ContainerClassLoader m_classloader;
/**
- * The list of all ComponentDefinition instances keyed by service classname.
+ * Internal class that maintains information about registered types.
*/
private ServiceRegistry m_services;
- private ContainerClassLoader m_classloader;
-
/**
- * List of the component classname recorded in the jar file manifests.
+ * The supplied configuration.
*/
- private List m_classnames = new LinkedList();
-
private Configuration m_config;
- private MetaDataVerifier m_verifier;
-
- private AssemblyVerifier m_assemblyVerifier;
-
- private Hashtable m_profileMapping = new Hashtable();
-
/**
* Hashtable of all installed profiles keyed by profile name.
*/
private Hashtable m_profiles = new Hashtable();
- private DependencyMap m_map;
-
- private Logger m_logger;
-
- //=======================================================================
- // LogEnabled
- //=======================================================================
-
/**
- * Invoked by the parent to assign the logging channel.
- * @param logger the logging channel
+ * The depenecy map supplied by the parent container.
*/
- public void enableLogging( Logger logger )
- {
- m_logger = logger;
- }
-
- /**
- * Returns the assigned logging channel.
- * @return the logging channel
- */
- protected Logger getLogger()
- {
- return m_logger;
- }
+ private DependencyMap m_map;
//=======================================================================
// Contextualizable
@@ -192,7 +156,6 @@
*/
public void contextualize( Context context ) throws ContextException
{
- m_context = context;
m_classloader = (ContainerClassLoader) context.get( CLASSLOADER_KEY );
m_map = (DependencyMap) context.get( MAP_KEY );
try
@@ -534,20 +497,10 @@
getLogger().error("verification failure", e );
}
}
- if( m_assemblyVerifier == null )
- {
- m_assemblyVerifier = new AssemblyVerifier();
- m_assemblyVerifier.enableLogging(
getLogger().getChildLogger("verifier") );
- }
- try
- {
- getLogger().debug("commencing assembly verification");
- m_assemblyVerifier.verifyAssembly( assembly );
- }
- catch( Throwable e )
- {
- getLogger().error("assembly verification failure", e );
- }
+ AssemblyVerifier verifier = new AssemblyVerifier();
+ verifier.enableLogging( getLogger().getChildLogger("verifier") );
+ getLogger().debug("commencing assembly verification");
+ verifier.verifyAssembly( assembly );
}
//=======================================================================
1.7 +1 -6
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/ServiceRegistry.java
Index: ServiceRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/ServiceRegistry.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceRegistry.java 5 Jul 2002 08:50:24 -0000 1.6
+++ ServiceRegistry.java 5 Jul 2002 09:30:07 -0000 1.7
@@ -204,11 +204,6 @@
return (Profile[]) vector.toArray( new Profile[0] );
}
- //private void getProfiles( DependencyMap map, Vector vector )
- //{
- // // not implemented yet
- //}
-
public Profile getCandidateProfile( DependencyDescriptor dependency )
throws UnresolvedProviderException
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
