Author: nfilotto
Date: 2012-03-22 10:36:10 -0400 (Thu, 22 Mar 2012)
New Revision: 5943
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
Log:
EXOJCR-1822: Fix that replaces the annotation NamingContext with NameTemplate in case of
the StandaloneContainer and RootContainer otherwise the related MBean has no name which
prevents it to be registered to the MBeanServer
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
===================================================================
---
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2012-03-22
14:20:46 UTC (rev 5942)
+++
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2012-03-22
14:36:10 UTC (rev 5943)
@@ -34,7 +34,7 @@
import org.exoplatform.container.xml.Configuration;
import org.exoplatform.management.annotations.Managed;
import org.exoplatform.management.annotations.ManagedDescription;
-import org.exoplatform.management.jmx.annotations.NamingContext;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.services.log.ExoLogger;
@@ -61,7 +61,7 @@
* tuan08(a)users.sourceforge.net Date: Jul 21, 2004 Time: 12:15:28 AM
*/
@Managed
-@NamingContext(@Property(key = "container", value = "root"))
+@NameTemplate(@Property(key = "container", value = "root"))
@RESTEndpoint(path = "rcontainer")
public class RootContainer extends ExoContainer
{
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
---
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-03-22
14:20:46 UTC (rev 5942)
+++
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2012-03-22
14:36:10 UTC (rev 5943)
@@ -29,7 +29,7 @@
import org.exoplatform.container.xml.Configuration;
import org.exoplatform.management.annotations.Managed;
import org.exoplatform.management.annotations.ManagedDescription;
-import org.exoplatform.management.jmx.annotations.NamingContext;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.services.log.ExoLogger;
@@ -49,7 +49,7 @@
* @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady
Azarenkov
* </a>
* @version $Id: StandaloneContainer.java 7168 2006-07-19 07:36:23Z peterit $
- * Singletone, context independent Exo Container with one configuration
+ * Singleton, context independent Exo Container with one configuration
* entry point. The configuration is set as follows: - client calls
* setConfigurationURL() or setConfigurationPath method BEFORE
* getInstance() - otherwise container in instantiation time looks for
@@ -58,7 +58,7 @@
* (from where JVM is started) for standalone. See
*/
@Managed
-@NamingContext(@Property(key = "container", value = "standalone"))
+@NameTemplate(@Property(key = "container", value = "standalone"))
@RESTEndpoint(path = "scontainer")
public class StandaloneContainer extends ExoContainer implements SessionManagerContainer
{
Show replies by date