costin 2002/11/01 22:52:12
Modified: modeler/src/java/org/apache/commons/modeler Registry.java
BaseRegistry.java
Log:
Few fixes
Revision Changes Path
1.6 +3 -2
jakarta-commons/modeler/src/java/org/apache/commons/modeler/Registry.java
Index: Registry.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/Registry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Registry.java 2 Nov 2002 00:35:14 -0000 1.5
+++ Registry.java 2 Nov 2002 06:52:12 -0000 1.6
@@ -403,6 +403,7 @@
public void registerComponent(Object bean, String domain, String type,
String name)
+ throws Exception
{
ManagedBean managed = registry.findManagedBean(type);
@@ -567,7 +568,7 @@
initMethods(realClass, methods, attMap, getAttMap, setAttMap, invokeAttMap
);
- if( type==null) type=Modeler.getModeler().generateSeqName(domain,
realClass);
+ if( type==null) type=super.generateSeqName(domain, realClass);
try {
1.2 +10 -6
jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseRegistry.java
Index: BaseRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseRegistry.java 2 Nov 2002 00:32:52 -0000 1.1
+++ BaseRegistry.java 2 Nov 2002 06:52:12 -0000 1.2
@@ -151,7 +151,7 @@
*
*/
public void registerComponent(Object bean, String domain, String name) {
- getRegistry().registerComponent(bean, domain,name );
+ getBaseRegistry().registerComponent(bean, domain,name );
}
/** The method used by applications to jmx-enable a component
@@ -163,7 +163,7 @@
public void registerClass(Class beanClass, String domain, String className,
String type, Object source)
{
- getRegistry().registerClass(beanClass, domain, className, type, source);
+ getBaseRegistry().registerClass(beanClass, domain, className, type, source);
}
/** Load component descriptors from a stream.
@@ -172,14 +172,18 @@
* @param type The type of the descriptor. Right now only 'modeler' is
* supported. In future we may add 'jboss' or other dtds.
*/
- public void loadDescriptors( InputStream is, String type ) {
+ public void loadDescriptors( InputStream is, String type )
+ throws Exception
+ {
}
/** Locate descriptors in the class loader, using a discovery mechansim
* For "modeler" it'll use "/META-INF/modler-mbeans.xml".
*/
- public void loadDescriptors( ClassLoader cl, String type ) {
+ public void loadDescriptors( ClassLoader cl, String type )
+ throws Exception
+ {
}
@@ -206,7 +210,7 @@
}
public void unregisterMBean( String name ) {
- getRegistry().unregisterMBean(name);
+ getBaseRegistry().unregisterMBean(name);
}
// Store all objects that have been registered via modeler
@@ -265,7 +269,7 @@
// -------------- Implementation ----------------------
private static BaseRegistry reg=null;
- public static BaseRegistry getRegistry() {
+ public static BaseRegistry getBaseRegistry() {
if( reg!=null ) return reg;
try {
Class.forName("javax.management.ObjectName");
--
To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>
