[exo-jcr-commits] exo-jcr SVN: r2101 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container/definition and 1 other directory.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2010-03-23 07:47:17 -0400 (Tue, 23 Mar 2010)
New Revision: 2101

Modified:
   kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
   kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
Log:
EXOJCR-601: The default dependencies were not used by default for the scopes of the servlet contexts

Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java	2010-03-23 09:56:17 UTC (rev 2100)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java	2010-03-23 11:47:17 UTC (rev 2101)
@@ -583,7 +583,7 @@
          dependencies = defaultDefinition.getDependencies();
          if (dependencies == null || dependencies.isEmpty())
          {
-            return;            
+            return;
          }
       }
       for (String context : dependencies)
@@ -960,6 +960,13 @@
          }
          initializeSettings(definition, true);
       }
+      if (!mDefinitions.containsKey(defaultDefinition.getName()) && defaultDefinition.getDependencies() != null
+         && !defaultDefinition.getDependencies().isEmpty())
+      {
+         // The default portal container has not been defined and some default
+         // dependencies have been defined
+         registerDependencies(defaultDefinition, mScopes);
+      }
       this.portalContainerNames = Collections.unmodifiableList(lPortalContainerNames);
       this.scopes = Collections.unmodifiableMap(mScopes);
    }

Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java	2010-03-23 09:56:17 UTC (rev 2100)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java	2010-03-23 11:47:17 UTC (rev 2101)
@@ -196,8 +196,14 @@
       assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
       deps = config.getDependencies("myPortal-pcdef");
       assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
+      names = config.getPortalContainerNames("fooX");
+      assertTrue(names != null && !names.isEmpty());
+      assertEquals(2, names.size());
+      assertTrue(names.contains("myPortal-dpcdef"));
+      assertTrue(names.contains("myPortal-pcdef"));
       names = config.getPortalContainerNames("foo");
       assertTrue(names != null && !names.isEmpty());
+      assertEquals(1, names.size());
       assertEquals("myPortal-dpcdef", names.get(0));
       names = config.getPortalContainerNames("myPortal");
       assertTrue(names != null && !names.isEmpty());
@@ -264,8 +270,13 @@
       assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX"));
       deps = config.getDependencies("myPortal-pcdef");
       assertTrue(deps != null && deps.size() == 3);
+      names = config.getPortalContainerNames("fooX");
+      assertTrue(names != null && !names.isEmpty());
+      assertEquals(1, names.size());
+      assertEquals("myPortal", names.get(0));
       names = config.getPortalContainerNames("foo");
       assertTrue(names != null && !names.isEmpty());
+      assertEquals(1, names.size());
       assertEquals("myPortal-pcdef", names.get(0));
       names = config.getPortalContainerNames("myPortal");
       assertTrue(names != null && !names.isEmpty());