[exo-jcr-commits] exo-jcr SVN: r3509 - jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl.

[do-not-reply at jboss.org]

Author: dkuleshov
Date: 2010-11-22 05:50:10 -0500 (Mon, 22 Nov 2010)
New Revision: 3509

Modified:
   jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
   jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java
Log:
JCR-1522: changed names of MBean components to id's like ${portal-container-name}-${repository-name}-${workspace-name}

Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java	2010-11-22 09:44:12 UTC (rev 3508)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java	2010-11-22 10:50:10 UTC (rev 3509)
@@ -89,6 +89,11 @@
    private final RepositoryEntry config;
 
    /**
+    * Repository name.
+    */
+   private final String name;
+
+   /**
     * System workspace DataManager.
     */
    private LocalWorkspaceDataManagerStub systemDataManager = null;
@@ -121,7 +126,9 @@
          config.setAccessControl(AccessControlPolicy.OPTIONAL);
 
       this.config = config;
+      this.name = parent.getContext().getName() + "-" + config.getName();
 
+      parent.registerComponentInstance(name, this);
       registerComponents();
    }
 
@@ -137,7 +144,7 @@
    @ManagedDescription("The repository container name")
    public String getName()
    {
-      return config.getName();
+      return name;
    }
 
    public NamespaceRegistry getNamespaceRegistry()

Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java	2010-11-22 09:44:12 UTC (rev 3508)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java	2010-11-22 10:50:10 UTC (rev 3509)
@@ -61,7 +61,7 @@
       super(new MX4JComponentAdapterFactory(), parent);
 
       repositoryContainer = parent;
-      this.name = config.getName();
+      this.name = repositoryContainer.getName() + "-" + config.getName();
    }
 
    // Components access methods -------