From do-not-reply at jboss.org Thu Mar 22 10:36:11 2012
Content-Type: multipart/mixed; boundary="===============0876277977911739600=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: exo-jcr-commits at lists.jboss.org
Subject: [exo-jcr-commits] exo-jcr SVN: r5943 -
 kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container.
Date: Thu, 22 Mar 2012 10:36:11 -0400
Message-ID: <201203221436.q2MEaBRE006639@svn01.web.mwc.hst.phx2.redhat.com>

--===============0876277977911739600==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/containe=
r/RootContainer.java
   kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/containe=
r/StandaloneContainer.java
Log:
EXOJCR-1822: Fix that replaces the annotation NamingContext with NameTempla=
te in case of the StandaloneContainer and RootContainer otherwise the relat=
ed MBean has no name which prevents it to be registered to the MBeanServer

Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/c=
ontainer/RootContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/contain=
er/RootContainer.java	2012-03-22 14:20:46 UTC (rev 5942)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/contain=
er/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
-(a)NamingContext(@Property(key =3D "container", value =3D "root"))
+(a)NameTemplate(@Property(key =3D "container", value =3D "root"))
 @RESTEndpoint(path =3D "rcontainer")
 public class RootContainer extends ExoContainer
 {

Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/c=
ontainer/StandaloneContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/contain=
er/StandaloneContainer.java	2012-03-22 14:20:46 UTC (rev 5942)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/contain=
er/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=3D"mailto:gennady.azarenkov(a)exoplatform.com">Gennady =
Azarenkov
  *         </a>
  * @version $Id: StandaloneContainer.java 7168 2006-07-19 07:36:23Z peteri=
t $
- *          Singletone, context independent Exo Container with one configu=
ration
+ *          Singleton, context independent Exo Container with one configur=
ation
  *          entry point. The configuration is set as follows: - client cal=
ls
  *          setConfigurationURL() or setConfigurationPath method BEFORE
  *          getInstance() - otherwise container in instantiation time look=
s for
@@ -58,7 +58,7 @@
  *          (from where JVM is started) for standalone. See
  */
 @Managed
-(a)NamingContext(@Property(key =3D "container", value =3D "standalone"))
+(a)NameTemplate(@Property(key =3D "container", value =3D "standalone"))
 @RESTEndpoint(path =3D "scontainer")
 public class StandaloneContainer extends ExoContainer implements SessionMa=
nagerContainer
 {


--===============0876277977911739600==--