mcconnell 2002/09/13 13:31:22
Modified: meta/src/java/org/apache/excalibur/meta/info
ServiceDescriptor.java Type.java
meta/src/java/org/apache/excalibur/meta/info/builder
XMLTypeCreator.java
Log:
Added the method getReference to the ServiceDescriptor class as a replacement
to the existing getService method and deperecated getService(), and fixed a
bug in
TypeBuilder.
Revision Changes Path
1.3 +12 -1
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/ServiceDescriptor.java
Index: ServiceDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/ServiceDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceDescriptor.java 21 Aug 2002 03:34:32 -0000 1.2
+++ ServiceDescriptor.java 13 Sep 2002 20:31:22 -0000 1.3
@@ -77,8 +77,19 @@
* Retrieve the service that service descriptor refers to.
*
* @return the service that service descriptor refers to.
+ * @deprecated use getReference()
*/
public ReferenceDescriptor getService()
+ {
+ return m_designator;
+ }
+
+ /**
+ * Retrieve the reference that service descriptor refers to.
+ *
+ * @return the reference that service descriptor refers to.
+ */
+ public ReferenceDescriptor getReference()
{
return m_designator;
}
1.3 +20 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/Type.java
Index: Type.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/Type.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Type.java 21 Aug 2002 03:34:32 -0000 1.2
+++ Type.java 13 Sep 2002 20:31:22 -0000 1.3
@@ -178,6 +178,25 @@
}
/**
+ * Retrieve a service with a particular classname.
+ *
+ * @param classname the service classname
+ * @return the service descriptor or null if it does not exist
+ */
+ public ServiceDescriptor getService( final String classname )
+ {
+ for( int i = 0; i < m_services.length; i++ )
+ {
+ final ServiceDescriptor service = m_services[i];
+ if( service.getReference().getClassname().equals( classname ) )
+ {
+ return service;
+ }
+ }
+ return null;
+ }
+
+ /**
* Return the set of Dependencies that this component requires to
operate.
*
* @return the set of Dependencies that this component requires to
operate.
@@ -202,7 +221,6 @@
return m_dependencies[ i ];
}
}
-
return null;
}
1.8 +2 -2
jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLTypeCreator.java 13 Sep 2002 14:32:22 -0000 1.7
+++ XMLTypeCreator.java 13 Sep 2002 20:31:22 -0000 1.8
@@ -108,7 +108,7 @@
// meta-data level - change is backward compatible
//
- configuration = info.getChild( "info", null );
+ configuration = info.getChild( "info", false );
if( configuration == null )
{
configuration = info.getChild( "component" );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
