mcconnell 2002/07/07 18:14:02
Modified: assembly build.xml
assembly/src/java/org/apache/excalibur/merlin/registry
ProfileRegistry.java TypeRegistry.java package.html
assembly/src/java/org/apache/excalibur/meta/info
ServiceDescriptor.java
assembly/src/java/org/apache/excalibur/meta/info/doc-files
Type.gif
assembly/src/java/org/apache/excalibur/meta/verifier
AssemblyVerifier.java MetaDataVerifier.java
Log:
javadoc updates
Revision Changes Path
1.13 +4 -2 jakarta-avalon-excalibur/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 7 Jul 2002 23:40:15 -0000 1.12
+++ build.xml 8 Jul 2002 01:14:01 -0000 1.13
@@ -59,8 +59,10 @@
<!-- MAIN TARGETS -->
- <target name="all" depends="clean,dist,javadoc,deploy"/>
+ <target name="all" depends="clean,meta,merlin,deploy"/>
<target name="dist" depends="build"/>
+ <target name="meta" depends="meta.javadoc"/>
+ <target name="merlin" depends="merlin.javadoc"/>
<target name="clean">
<delete dir="${build}"/>
@@ -251,7 +253,7 @@
</target>
<target name="patch">
- <replace token="getDescription" value="getInfo" dir="src/java">
+ <replace token="getServiceDesignator" value="getService" dir="src/java">
<include name="**/*.*"/>
</replace>
</target>
1.2 +4 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/ProfileRegistry.java
Index: ProfileRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/ProfileRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProfileRegistry.java 7 Jul 2002 04:40:15 -0000 1.1
+++ ProfileRegistry.java 8 Jul 2002 01:14:01 -0000 1.2
@@ -33,6 +33,7 @@
import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.excalibur.merlin.kernel.Map;
import org.apache.excalibur.merlin.kernel.Container;
+import org.apache.excalibur.merlin.kernel.Selector;
/**
* Internal table that holds available component type keyed relative
@@ -139,7 +140,7 @@
ServiceDescriptor[] services = profile.getType().getServices();
for( int j=0; j<services.length; j++ )
{
- if( services[j].getServiceDesignator().matches( designator ) )
+ if( services[j].getService().matches( designator ) )
{
list.add( profile );
break;
@@ -319,7 +320,7 @@
ServiceDescriptor[] services = profile.getType().getServices();
for( int i=0; i<services.length; i++ )
{
- register( services[i].getServiceDesignator(), profile );
+ register( services[i].getService(), profile );
}
return profile;
}
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/TypeRegistry.java
Index: TypeRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/TypeRegistry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeRegistry.java 7 Jul 2002 23:40:56 -0000 1.2
+++ TypeRegistry.java 8 Jul 2002 01:14:01 -0000 1.3
@@ -157,7 +157,7 @@
*/
Class getServiceClass( ServiceDescriptor service ) throws
RegistryRuntimeException
{
- final String classname = service.getServiceDesignator().getClassname();
+ final String classname = service.getService().getClassname();
try
{
return m_classloader.loadClass( classname );
@@ -211,7 +211,7 @@
ServiceDescriptor[] services = type.getServices();
for( int i=0; i<services.length; i++ )
{
- register( services[i].getServiceDesignator(), type );
+ register( services[i].getService(), type );
}
}
1.7 +2 -0
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/package.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- package.html 7 Jul 2002 23:14:02 -0000 1.6
+++ package.html 8 Jul 2002 01:14:01 -0000 1.7
@@ -20,7 +20,9 @@
<h3>Object Model</h3>
<p>The primary service is a type {@link
org.apache.excalibur.merlin.registry.Registry}. The registry acts as a component
{@link org.apache.excalibur.meta.info.Type} repository and {@link
org.apache.excalibur.meta.data.Profile} manager. Each component type represents a
concrete component implementation class. For each component type, the container
associates at least one instantiation {@link org.apache.excalibur.meta.data.Profile}.
A profile is either a default profile generated by the registry based on
meta-information derived from the type, or, an explicit profile declared by the
component assembler via the registry configuration. Multiple profiles for a
particular component type can coexist in the same registry.
+<!--
<h3>Package Structure (UML)</h3>
<p><img src=doc-files/registry.gif border=0></p>
+-->
</body>
1.2 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/ServiceDescriptor.java
Index: ServiceDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/ServiceDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceDescriptor.java 5 Jul 2002 10:39:00 -0000 1.1
+++ ServiceDescriptor.java 8 Jul 2002 01:14:02 -0000 1.2
@@ -75,7 +75,7 @@
*
* @return the service that service descriptor refers to.
*/
- public ServiceDesignator getServiceDesignator()
+ public ServiceDesignator getService()
{
return m_designator;
}
1.2 +41 -39
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/doc-files/Type.gif
<<Binary file>>
1.4 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/verifier/AssemblyVerifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AssemblyVerifier.java 7 Jul 2002 23:22:47 -0000 1.3
+++ AssemblyVerifier.java 8 Jul 2002 01:14:02 -0000 1.4
@@ -454,7 +454,7 @@
{
for( int i = 0; i < candidates.length; i++ )
{
- final ServiceDesignator other = candidates[ i ].getServiceDesignator();
+ final ServiceDesignator other = candidates[ i ].getService();
if( service.matches( other ) )
{
return true;
1.3 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/verifier/MetaDataVerifier.java
Index: MetaDataVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/verifier/MetaDataVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MetaDataVerifier.java 7 Jul 2002 04:28:31 -0000 1.2
+++ MetaDataVerifier.java 8 Jul 2002 01:14:02 -0000 1.3
@@ -196,7 +196,7 @@
final Class[] classes = new Class[ services.length ];
for( int i = 0; i < services.length; i++ )
{
- final ServiceDesignator service = services[ i ].getServiceDesignator();
+ final ServiceDesignator service = services[ i ].getService();
final String classname = service.getClassname();
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
