Author: areshetnyak
Date: 2010-05-28 10:17:22 -0400 (Fri, 28 May 2010)
New Revision: 2444
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/config/RepositoryServiceConfigurationImpl.java
Log:
EXOJCR-735 : Refactoring method RepositoryContainer.registerWorkspacesComponents().
Remove unused WorkspaceOrderComparator.
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-05-28
10:29:30 UTC (rev 2443)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-05-28
14:17:22 UTC (rev 2444)
@@ -535,30 +535,22 @@
private void registerWorkspacesComponents() throws RepositoryException,
RepositoryConfigurationException
{
- List<WorkspaceEntry> wsEntries = new ArrayList<WorkspaceEntry>();
-
- for (WorkspaceEntry ws : config.getWorkspaceEntries())
+ // System workspace should be first initialize.
+ for (WorkspaceEntry we : config.getWorkspaceEntries())
{
- if (ws.getName().equals(config.getSystemWorkspaceName()))
+ if (we.getName().equals(config.getSystemWorkspaceName()))
{
- if (wsEntries.size() == 0)
- {
- wsEntries.add(ws);
- }
- else
- {
- wsEntries.add(0, ws);
- }
- }
- else
- {
- wsEntries.add(ws);
+ registerWorkspace(we);
}
}
- for (int i = 0; i < wsEntries.size(); i++)
+ // Initialize other (non system) workspaces.
+ for (WorkspaceEntry we : config.getWorkspaceEntries())
{
- registerWorkspace(wsEntries.get(i));
+ if (!we.getName().equals(config.getSystemWorkspaceName()))
+ {
+ registerWorkspace(we);
+ }
}
}
@@ -591,24 +583,5 @@
ntManager.start();
}
-
- /**
- * Workspaces order comparator.
- *
- */
- private static class WorkspaceOrderComparator implements
Comparator<WorkspaceEntry>
- {
- private final String sysWs;
-
- private WorkspaceOrderComparator(String sysWs)
- {
- this.sysWs = sysWs;
- }
-
- public int compare(WorkspaceEntry o1, WorkspaceEntry o2)
- {
- String n1 = o1.getName();
- return n1.equals(sysWs) ? -1 : 0;
- }
- }
+
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2010-05-28
10:29:30 UTC (rev 2443)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2010-05-28
14:17:22 UTC (rev 2444)
@@ -251,10 +251,11 @@
{
try
{
- if (configExtensionPaths.isEmpty() || (configurationPersister != null &&
configurationPersister.hasConfig()))
+ if ((configurationPersister != null &&
configurationPersister.hasConfig()))
{
initFromStream(configurationService.getInputStream(param.getValue()));
+ // Will be merged extension repository configuration with configuration from
persister.
if (!configExtensionPaths.isEmpty())
{
String[] paths = (String[])configExtensionPaths.toArray(new
String[configExtensionPaths.size()]);
Show replies by date