Author: nfilotto Date: 2011-03-10 07:28:09 -0500 (Thu, 10 Mar 2011) New Revision: 4068 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 kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java Log: EXOJCR-1240: Give a more understandable name to all the existing Containers 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 2011-03-10 12:14:16 UTC (rev 4067) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2011-03-10 12:28:09 UTC (rev 4068) @@ -145,6 +145,7 @@ { public Void run() { + context.setName(parent.getContext().getName() + "-" + name); parent.registerComponentInstance(name, RepositoryContainer.this); return null; } @@ -180,6 +181,7 @@ { public Void run() { + context.setName(parent.getContext().getName() + "-" + name); parent.registerComponentInstance(name, RepositoryContainer.this); return null; } 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 2011-03-10 12:14:16 UTC (rev 4067) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java 2011-03-10 12:28:09 UTC (rev 4068) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.jcr.impl; +import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.jmx.MX4JComponentAdapterFactory; import org.exoplatform.management.annotations.Managed; @@ -32,6 +33,8 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import java.security.PrivilegedAction; + import javax.jcr.RepositoryException; /** @@ -61,6 +64,14 @@ repositoryContainer = parent; this.name = config.getName(); + SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() + { + public Void run() + { + context.setName(repositoryContainer.getName() + "-" + name); + return null; + } + }); } // Components access methods ------- Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2011-03-10 12:14:16 UTC (rev 4067) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2011-03-10 12:28:09 UTC (rev 4068) @@ -93,7 +93,7 @@ public ExoContainer() { - context = new ExoContainerContext(this, this.getClass().getName()); + context = new ExoContainerContext(this, this.getClass().getSimpleName()); SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() { public Void run() @@ -109,7 +109,7 @@ public ExoContainer(PicoContainer parent) { super(parent); - context = new ExoContainerContext(this, this.getClass().getName()); + context = new ExoContainerContext(this, this.getClass().getSimpleName()); SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() { public Void run() @@ -124,7 +124,7 @@ public ExoContainer(ComponentAdapterFactory factory, PicoContainer parent) { super(factory, parent); - context = new ExoContainerContext(this, this.getClass().getName()); + context = new ExoContainerContext(this, this.getClass().getSimpleName()); SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() { public Void run()