[exo-jcr-commits] exo-jcr SVN: r3502 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl.

[do-not-reply at jboss.org]

Author: dkuleshov
Date: 2010-11-22 03:55:10 -0500 (Mon, 22 Nov 2010)
New Revision: 3502

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java
Log:
EXOJCR-1000: changed components names to id's like ${portal-container-name}-${repository-name}-${workspace-name}

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java	2010-11-22 08:53:31 UTC (rev 3501)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java	2010-11-22 08:55:10 UTC (rev 3502)
@@ -91,6 +91,11 @@
    private final RepositoryEntry config;
 
    /**
+    * Repository name.
+    */
+   private final String name;
+
+   /**
     * System workspace DataManager.
     */
    private LocalWorkspaceDataManagerStub systemDataManager = null;
@@ -131,7 +136,9 @@
 
       this.config = config;
       this.addNamespacePlugins = addNamespacePlugins;
+      this.name = parent.getContext().getName() + "-" + config.getName();
 
+      parent.registerComponentInstance(name, this);
       registerComponents();
    }
 
@@ -158,7 +165,9 @@
          config.setAccessControl(AccessControlPolicy.OPTIONAL);
 
       this.config = config;
+      this.name = parent.getContext().getName() + "-" + config.getName();
 
+      parent.registerComponentInstance(name, this);
       registerComponents();
    }
 
@@ -174,7 +183,7 @@
    @ManagedDescription("The repository container name")
    public String getName()
    {
-      return config.getName();
+      return name;
    }
 
    public NamespaceRegistry getNamespaceRegistry()

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java	2010-11-22 08:53:31 UTC (rev 3501)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java	2010-11-22 08:55:10 UTC (rev 3502)
@@ -60,7 +60,7 @@
       super(new MX4JComponentAdapterFactory(), parent);
 
       repositoryContainer = parent;
-      this.name = config.getName();
+      this.name = repositoryContainer.getName() + "-" + config.getName();
    }
 
    // Components access methods -------