You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2005/12/27 17:27:11 UTC
svn commit: r359233 - in
/cocoon/trunk/src/java/org/apache/cocoon/core/container:
CoreServiceManager.java RoleManager.java StandaloneServiceSelector.java
handler/AbstractComponentHandler.java handler/LazyHandler.java
Author: giacomo
Date: Tue Dec 27 08:27:06 2005
New Revision: 359233
URL: http://svn.apache.org/viewcvs?rev=359233&view=rev
Log:
fill role information to ComponentInfo structure
Modified:
cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/RoleManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/LazyHandler.java
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java?rev=359233&r1=359232&r2=359233&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java Tue Dec 27 08:27:06 2005
@@ -703,6 +703,7 @@
info.fill(configuration);
info.setJmxDomain(JMXUtils.findJmxDomain(info.getJmxDomain(), this));
info.setJmxName(JMXUtils.findJmxName(info.getJmxName(), className));
+ info.setRole(role);
}
info.setConfiguration(configuration);
info.setServiceClassName(className);
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/RoleManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/RoleManager.java?rev=359233&r1=359232&r2=359233&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/RoleManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/RoleManager.java Tue Dec 27 08:27:06 2005
@@ -194,6 +194,7 @@
info = new ComponentInfo();
info.setServiceClassName(defaultClassName);
info.fill(role);
+ info.setRole(roleName);
this.classNames.put(roleName, info);
} else {
// Check that it's consistent with the existing info
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java?rev=359233&r1=359232&r2=359233&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Tue Dec 27 08:27:06 2005
@@ -144,6 +144,7 @@
} else {
info = new ComponentInfo();
info.fill(configuration);
+ info.setRole(role);
info.setJmxDomain(JMXUtils.findJmxDomain(info.getJmxDomain(), serviceManager));
info.setJmxName(JMXUtils.findJmxName(info.getJmxName(), componentClass.getName()));
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java?rev=359233&r1=359232&r2=359233&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java Tue Dec 27 08:27:06 2005
@@ -117,6 +117,7 @@
// this component does not use avalon interfaces, so get the info from the configuration
info.fill(info.getConfiguration());
}
+ info.setRole(role);
// Create the factory to use to create the instances of the Component.
ComponentFactory factory;
@@ -289,6 +290,7 @@
info.setConfiguration(config);
info.setJmxDomain(JMXUtils.findJmxDomain(info.getJmxDomain(), manager));
info.setJmxName(JMXUtils.findJmxName(info.getJmxName(), clazz.getName()));
+ info.setRole("XSP");
return getComponentHandler(null, env, info);
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/LazyHandler.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/LazyHandler.java?rev=359233&r1=359232&r2=359233&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/LazyHandler.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/handler/LazyHandler.java Tue Dec 27 08:27:06 2005
@@ -51,7 +51,7 @@
info.setServiceClassName(className);
info.setJmxDomain(JMXUtils.findJmxDomain(info.getJmxDomain(), this.compEnv.serviceManager));
info.setJmxName(JMXUtils.findJmxName(info.getJmxName(), className));
-
+ info.setRole(this.role);
this.delegate = AbstractComponentHandler.getComponentHandler(role, compEnv, info);
this.delegate.initialize();
JMXUtils.setupJmxFor(this.delegate, info);
@@ -127,6 +127,7 @@
info.setConfiguration(config);
info.setJmxDomain(JMXUtils.findJmxDomain(info.getJmxDomain(), this.compEnv.serviceManager));
info.setJmxName(JMXUtils.findJmxName(info.getJmxName(), className));
+ info.setRole(role);
return info;
}
return this.delegate.getInfo();