September 2010 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r3177 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container and 2 other directories.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2010-09-22 13:28:19 -0400 (Wed, 22 Sep 2010) New Revision: 3177 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/TestPortalContainer.java kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml Log: EXOJCR-974: Apply changes for JCR-1.12.3-CP01 and adapt it to remain compatible with EXOJCR-842 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-09-22 11:37:48 UTC (rev 3176) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-09-22 17:28:19 UTC (rev 3177) @@ -41,7 +41,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -109,9 +108,9 @@ private volatile boolean initialized; /** - * The set of all the portal containers + * The list of all the portal containers */ - private Set<String> portalContainerNames = Collections.unmodifiableSet(new HashSet<String>()); + private List<String> portalContainerNames = Collections.unmodifiableList(new ArrayList<String>()); /** * The set of all the portal containers that have been disabled @@ -423,12 +422,12 @@ */ public synchronized void registerPortalContainerName(String name) { - if (!portalContainerNames.contains(name)) + if (!portalContainerNames.contains(name) && !portalContainerNamesDisabled.contains(name)) { - final Set<String> lPortalContainerNames = new LinkedHashSet<String>(portalContainerNames.size() + 1); + final List<String> lPortalContainerNames = new ArrayList<String>(portalContainerNames.size() + 1); lPortalContainerNames.add(name); lPortalContainerNames.addAll(portalContainerNames); - this.portalContainerNames = Collections.unmodifiableSet(lPortalContainerNames); + this.portalContainerNames = Collections.unmodifiableList(lPortalContainerNames); } } @@ -440,9 +439,9 @@ { if (portalContainerNames.contains(name)) { - final Set<String> lPortalContainerNames = new LinkedHashSet<String>(portalContainerNames); + final List<String> lPortalContainerNames = new ArrayList<String>(portalContainerNames); lPortalContainerNames.remove(name); - this.portalContainerNames = Collections.unmodifiableSet(lPortalContainerNames); + this.portalContainerNames = Collections.unmodifiableList(lPortalContainerNames); if (hasDefinition()) { // The new behavior is expected @@ -490,7 +489,13 @@ // The given context is a portal container return Collections.singletonList(contextName); } - return Collections.emptyList(); + else if (portalContainerNamesDisabled.contains(contextName)) + { + // The given context name is a context name of a disabled portal container + return Collections.emptyList(); + } + // By default we scope it to all the portal containers + return portalContainerNames; } return result; } @@ -521,12 +526,18 @@ if (result == null || result.isEmpty()) { // This context has not been added as dependency of any portal containers + if (portalContainerNamesDisabled.contains(contextName)) + { + // The given context name is a context name of a disabled portal container + return null; + } if (PropertyManager.isDevelopping()) { - log.info("The context '" + contextName + "' has not been added as " + + log.debug("The context '" + contextName + "' has not been added as " + "dependency of any portal containers"); } - return null; + // by default we will return the default portal container + return defaultDefinition.getName(); } return result.get(0); } @@ -1086,7 +1097,13 @@ */ private void initialize(Map<String, PortalContainerDefinition> mDefinitions) { - final Set<String> lPortalContainerNames = new LinkedHashSet<String>(mDefinitions.size() + 1); + final List<String> lPortalContainerNames = new ArrayList<String>(mDefinitions.size() + 1); + boolean isDefaultPortalDisabled = isPortalContainerNameDisabled(defaultDefinition.getName()); + if (mDefinitions.isEmpty() || !isDefaultPortalDisabled) + { + // Add the default portal container name if not disabled + lPortalContainerNames.add(defaultDefinition.getName()); + } final Map<String, List<String>> mScopes = new HashMap<String, List<String>>(); boolean first = true; for (Map.Entry<String, PortalContainerDefinition> entry : mDefinitions.entrySet()) @@ -1100,24 +1117,27 @@ continue; } boolean hasChanged = false; - lPortalContainerNames.add(name); + if (!lPortalContainerNames.contains(name)) + { + lPortalContainerNames.add(name); + } if (first) { first = false; // Initialize the main fields thanks to the data found in the first portal container - if (defaultDefinition.getName() == DEFAULT_PORTAL_CONTAINER_NAME) + if (defaultDefinition.getName() == DEFAULT_PORTAL_CONTAINER_NAME || isDefaultPortalDisabled) { defaultDefinition.setName(name); hasChanged = true; } - if (defaultDefinition.getRestContextName() == DEFAULT_REST_CONTEXT_NAME + if ((defaultDefinition.getRestContextName() == DEFAULT_REST_CONTEXT_NAME || isDefaultPortalDisabled) && definition.getRestContextName() != null && definition.getRestContextName().trim().length() > 0) { defaultDefinition.setRestContextName(definition.getRestContextName().trim()); hasChanged = true; } - if (defaultDefinition.getRealmName() == DEFAULT_REALM_NAME && definition.getRealmName() != null - && definition.getRealmName().trim().length() > 0) + if ((defaultDefinition.getRealmName() == DEFAULT_REALM_NAME || isDefaultPortalDisabled) + && definition.getRealmName() != null && definition.getRealmName().trim().length() > 0) { defaultDefinition.setRealmName(definition.getRealmName().trim()); hasChanged = true; @@ -1132,10 +1152,8 @@ } initializeSettings(definition, true); } - if (mDefinitions.isEmpty()) + if (!mDefinitions.containsKey(defaultDefinition.getName())) { - // Add the default portal container name - lPortalContainerNames.add(defaultDefinition.getName()); // Apply the changes corresponding to the default definition applyChanges(defaultDefinition); initializeSettings(defaultDefinition, false); @@ -1145,7 +1163,7 @@ // dependencies have been defined registerDependencies(defaultDefinition, mScopes); } - if (!portalContainerNamesDisabled.isEmpty()) + if (mDefinitions.isEmpty() && !portalContainerNamesDisabled.isEmpty()) { if (PropertyManager.isDevelopping()) { @@ -1156,7 +1174,7 @@ portalContainerNamesDisabled = Collections.unmodifiableSet(new HashSet<String>()); } } - this.portalContainerNames = Collections.unmodifiableSet(lPortalContainerNames); + this.portalContainerNames = Collections.unmodifiableList(lPortalContainerNames); this.scopes = Collections.unmodifiableMap(mScopes); // clear the changes changes.clear(); Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java =================================================================== --- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java 2010-09-22 11:37:48 UTC (rev 3176) +++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java 2010-09-22 17:28:19 UTC (rev 3177) @@ -27,7 +27,7 @@ * Created by The eXo Platform SAS * Author : Nicolas Filotto * nicolas.filotto(a)exoplatform.com - * 18 f�vr. 2010 + * 18 fﾎvr. 2010 */ public class TestPortalContainer extends AbstractTestContainer { @@ -43,7 +43,7 @@ assertEquals("myRest", portal.getRestContextName()); assertEquals("my-exo-domain", portal.getRealmName()); - assertFalse(PortalContainer.isPortalContainerName("myPortal")); + assertTrue(PortalContainer.isPortalContainerName("myPortal")); assertTrue(PortalContainer.isPortalContainerName("portal")); assertFalse(PortalContainer.isPortalContainerName("foo")); @@ -73,7 +73,7 @@ assertEquals("myRest", PortalContainer.getRestContextName("foo")); assertEquals("my-exo-domain", PortalContainer.getRealmName("foo")); - assertFalse(PortalContainer.isPortalContainerName("myPortal")); + assertTrue(PortalContainer.isPortalContainerName("myPortal")); assertTrue(PortalContainer.isPortalContainerName("portal")); assertFalse(PortalContainer.isPortalContainerName("foo")); @@ -84,7 +84,7 @@ assertEquals("myRest", PortalContainer.getCurrentRestContextName()); assertEquals("my-exo-domain", PortalContainer.getCurrentRealmName()); - assertFalse(PortalContainer.isPortalContainerName("myPortal")); + assertTrue(PortalContainer.isPortalContainerName("myPortal")); assertTrue(PortalContainer.isPortalContainerName("portal")); assertFalse(PortalContainer.isPortalContainerName("foo")); } 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-09-22 11:37:48 UTC (rev 3176) +++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-09-22 17:28:19 UTC (rev 3177) @@ -30,7 +30,7 @@ * Created by The eXo Platform SAS * Author : Nicolas Filotto * nicolas.filotto(a)exoplatform.com - * 18 f�vr. 2010 + * 18 fﾎvr. 2010 */ public class TestPortalContainerConfig extends AbstractTestContainer { @@ -214,7 +214,6 @@ assertFalse(config.isPortalContainerName("myPortal")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); assertTrue(config.isPortalContainerName(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME)); - // Needed for backward compatibility assertTrue(config.isScopeValid(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, "foo")); assertFalse(config.isScopeValid("foo", "foo")); @@ -296,14 +295,18 @@ assertNull(config.getDependencies("myPortal")); assertNull(config.getDependencies("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals("myPortal", names.get(0)); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); - assertNull(config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal", config.getPortalContainerName("foo")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest", config.getRestContextName("foo")); assertEquals("myRest", config.getRestContextName("myPortal")); @@ -312,23 +315,75 @@ assertEquals("my-exo-domain", config.getRealmName("myPortal")); assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("foo")); - assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal")); assertTrue(config.isPortalContainerName("myPortal-pcdef")); // Needed for backward compatibility assertFalse(config.isScopeValid("foo", "foo")); - assertFalse(config.isScopeValid("myPortal", "foo")); - assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); - assertFalse(config.isScopeValid("myPortal", "myPortal")); + assertTrue(config.isScopeValid("myPortal", "foo")); + assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); + assertTrue(config.isScopeValid("myPortal", "myPortal")); assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); assertTrue(config.hasDefinition()); // Unregister the portal container rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml", "disable-pc"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); + assertTrue(config.isPortalContainerName("myPortal")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); + assertFalse(config.isScopeValid("myPortal", "myPortal-pcdef")); + assertTrue(config.isScopeValid("myPortal", "myPortal")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && names.isEmpty()); + names = config.getPortalContainerNames("myPortal"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal")); + // Unregister the default portal container + rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml", "disable-pc2"); + config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); + assertNull(config.getPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); + assertFalse(config.isScopeValid("myPortal", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal", "myPortal")); + names = config.getPortalContainerNames("myPortal-pcdef"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + names = config.getPortalContainerNames("myPortal"); + assertTrue(names != null && names.isEmpty()); + config.disablePortalContainer("myPortal-pcdef"); + assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertNull(config.getPortalContainerName("myPortal")); + assertFalse(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("myPortal")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); + assertFalse(config.isScopeValid("myPortal", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal", "myPortal")); + names = config.getPortalContainerNames("myPortal-pcdef"); + assertTrue(names != null && names.isEmpty()); + names = config.getPortalContainerNames("myPortal"); + assertTrue(names != null && names.isEmpty()); + config.registerPortalContainerName("myPortal-pcdef"); + assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertNull(config.getPortalContainerName("myPortal")); + assertFalse(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("myPortal")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); + assertFalse(config.isScopeValid("myPortal", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal", "myPortal")); + names = config.getPortalContainerNames("myPortal-pcdef"); + assertTrue(names != null && names.isEmpty()); + names = config.getPortalContainerNames("myPortal"); + assertTrue(names != null && names.isEmpty()); // Without dependencies and with no portal container name rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-empty-portal-def.xml"); @@ -374,14 +429,18 @@ assertNull(config.getDependencies("myPortal")); assertNull(config.getDependencies("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals("myPortal", names.get(0)); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); - assertNull(config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal", config.getPortalContainerName("foo")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest", config.getRestContextName("foo")); assertEquals("myRest", config.getRestContextName("myPortal")); @@ -390,13 +449,13 @@ assertEquals("my-exo-domain", config.getRealmName("myPortal")); assertEquals("my-exo-domain", config.getRealmName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("foo")); - assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal")); assertTrue(config.isPortalContainerName("myPortal-pcdef")); // Needed for backward compatibility assertFalse(config.isScopeValid("foo", "foo")); - assertFalse(config.isScopeValid("myPortal", "foo")); - assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); - assertFalse(config.isScopeValid("myPortal", "myPortal")); + assertTrue(config.isScopeValid("myPortal", "foo")); + assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); + assertTrue(config.isScopeValid("myPortal", "myPortal")); assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); assertTrue(config.hasDefinition()); // Unregister the portal container @@ -420,17 +479,24 @@ assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); names = config.getPortalContainerNames("fooX"); assertTrue(names != null && !names.isEmpty()); - assertEquals(1, names.size()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); - assertNull(config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest-dpcdef", config.getRestContextName("foo")); assertEquals("myRest-dpcdef", config.getRestContextName("myPortal")); @@ -440,23 +506,68 @@ assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("foo")); assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal-dpcdef")); assertTrue(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("foo", "fooX")); assertFalse(config.isScopeValid("myPortal", "fooX")); + assertTrue(config.isScopeValid("myPortal-dpcdef", "fooX")); assertTrue(config.isScopeValid("myPortal-pcdef", "fooX")); assertTrue(config.hasDefinition()); // Unregister the portal container rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml", "disable-pc"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal-dpcdef")); assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("foo")); + assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal-dpcdef")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isScopeValid("foo", "fooX")); + assertFalse(config.isScopeValid("myPortal", "fooX")); + assertTrue(config.isScopeValid("myPortal-dpcdef", "fooX")); + assertFalse(config.isScopeValid("myPortal-pcdef", "fooX")); + assertTrue(config.isScopeValid("myPortal-dpcdef", "myPortal-dpcdef")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && names.isEmpty()); - assertFalse(config.isScopeValid("myPortal-pcdef", "fooX")); + names = config.getPortalContainerNames("myPortal-dpcdef"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); names = config.getPortalContainerNames("fooX"); - assertTrue(names != null && names.isEmpty()); - + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + // Unregister the default portal container + rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml", "disable-pc2"); + config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); + assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal")); + assertNull(config.getPortalContainerName("myPortal-dpcdef")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("foo")); + assertFalse(config.isPortalContainerName("myPortal")); + assertFalse(config.isPortalContainerName("myPortal-dpcdef")); + assertTrue(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isScopeValid("foo", "fooX")); + assertFalse(config.isScopeValid("myPortal", "fooX")); + assertFalse(config.isScopeValid("myPortal-dpcdef", "fooX")); + assertTrue(config.isScopeValid("myPortal-pcdef", "fooX")); + assertFalse(config.isScopeValid("myPortal-dpcdef", "myPortal-dpcdef")); + assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + names = config.getPortalContainerNames("myPortal-pcdef"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + names = config.getPortalContainerNames("myPortal-dpcdef"); + assertTrue(names != null && names.isEmpty()); + names = config.getPortalContainerNames("fooX"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + profiles = new String[]{"AddDependencies", "AddDependenciesBefore-No-Target", "AddDependenciesBefore-With-Fake-Target", "AddDependenciesBefore-With-Target", "AddDependenciesAfter-No-Target", @@ -488,19 +599,24 @@ } names = config.getPortalContainerNames("fooX"); assertTrue(names != null && !names.isEmpty()); - assertEquals(1, names.size()); + 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-pcdef", names.get(0)); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest-dpcdef", config.getRestContextName("foo")); assertEquals("myRest-dpcdef", config.getRestContextName("myPortal")); @@ -519,18 +635,68 @@ rootContainer = createRootContainer( "portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml", "with-profiles", profile, "disable-pc"); - config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); - assertNull(config.getPortalContainerName("foo")); + config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal-dpcdef")); assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("foo")); + assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal-dpcdef")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isScopeValid("foo", "fooX")); + assertFalse(config.isScopeValid("myPortal", "fooX")); + assertTrue(config.isScopeValid("myPortal-dpcdef", "fooX")); + assertFalse(config.isScopeValid("myPortal-pcdef", "fooX")); + assertTrue(config.isScopeValid("myPortal-dpcdef", "myPortal-dpcdef")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && names.isEmpty()); - assertFalse(config.isScopeValid("myPortal-pcdef", "fooX")); + names = config.getPortalContainerNames("myPortal-dpcdef"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); names = config.getPortalContainerNames("fooX"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + // Unregister the default portal container + rootContainer = createRootContainer( + "portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml", + "with-profiles", profile, "disable-pc2"); + config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); + assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal")); + assertNull(config.getPortalContainerName("myPortal-dpcdef")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("foo")); + assertFalse(config.isPortalContainerName("myPortal")); + assertFalse(config.isPortalContainerName("myPortal-dpcdef")); + assertTrue(config.isPortalContainerName("myPortal-pcdef")); + assertFalse(config.isScopeValid("foo", "fooX")); + assertFalse(config.isScopeValid("myPortal", "fooX")); + assertFalse(config.isScopeValid("myPortal-dpcdef", "fooX")); + assertTrue(config.isScopeValid("myPortal-pcdef", "fooX")); + assertFalse(config.isScopeValid("myPortal-dpcdef", "myPortal-dpcdef")); + assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + names = config.getPortalContainerNames("myPortal-pcdef"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + names = config.getPortalContainerNames("myPortal-dpcdef"); + assertTrue(names != null && names.isEmpty()); + names = config.getPortalContainerNames("foo"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + names = config.getPortalContainerNames("fooX"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); } // With dependencies @@ -544,12 +710,13 @@ assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals("myPortal", names.get(0)); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest", config.getRestContextName("foo")); assertEquals("myRest", config.getRestContextName("myPortal")); @@ -558,27 +725,65 @@ assertEquals("my-exo-domain", config.getRealmName("myPortal")); assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("foo")); - assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal")); assertTrue(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("foo", "foo")); assertFalse(config.isScopeValid("myPortal", "foo")); assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); - assertFalse(config.isScopeValid("myPortal-pcdef", "fooY")); + assertTrue(config.isScopeValid("myPortal-pcdef", "fooY")); assertTrue(config.hasDefinition()); // Unregister the portal container rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml", "disable-pc"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); - assertNull(config.getPortalContainerName("foo")); + assertEquals("myPortal", config.getPortalContainerName("foo")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertTrue(config.isPortalContainerName("myPortal")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); + assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); + assertFalse(config.isScopeValid("myPortal", "myPortal-pcdef")); + assertTrue(config.isScopeValid("myPortal", "myPortal")); + assertTrue(config.isScopeValid("myPortal", "foo")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && names.isEmpty()); - assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); + names = config.getPortalContainerNames("myPortal"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); - + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal")); + // Unregister the default portal container + rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml", "disable-pc2"); + config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); + assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); + assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal-pcdef")); + assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); + assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal")); + assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); + assertFalse(config.isScopeValid("myPortal", "myPortal-pcdef")); + assertFalse(config.isScopeValid("myPortal", "myPortal")); + assertFalse(config.isScopeValid("myPortal", "foo")); + names = config.getPortalContainerNames("myPortal-pcdef"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + names = config.getPortalContainerNames("myPortal"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + names = config.getPortalContainerNames("foo"); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal-pcdef")); + for (String profile : profiles) { rootContainer = @@ -612,12 +817,13 @@ assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals("myPortal", names.get(0)); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest", config.getRestContextName("foo")); assertEquals("myRest", config.getRestContextName("myPortal")); @@ -626,7 +832,7 @@ assertEquals("my-exo-domain", config.getRealmName("myPortal")); assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("foo")); - assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal")); assertTrue(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("foo", "foo")); assertFalse(config.isScopeValid("myPortal", "foo")); @@ -636,7 +842,7 @@ rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def2.xml", "with-profiles", profile, "disable-pc"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); - assertNull(config.getPortalContainerName("foo")); + assertEquals("myPortal", config.getPortalContainerName("foo")); assertNull(config.getPortalContainerName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); @@ -644,7 +850,9 @@ assertTrue(names != null && names.isEmpty()); assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal")); } // With dependencies and with default portal container definition @@ -658,18 +866,21 @@ deps = config.getDependencies("myPortal-pcdef"); assertTrue(deps != null && deps.size() == 3); names = config.getPortalContainerNames("fooX"); - assertTrue(names != null && names.isEmpty()); + 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()); + assertTrue(names != null && !names.isEmpty()); + assertEquals("myPortal", names.get(0)); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest", config.getRestContextName("foo")); assertEquals("myRest", config.getRestContextName("myPortal")); @@ -678,7 +889,7 @@ assertEquals("my-exo-domain", config.getRealmName("myPortal")); assertEquals("my-exo-domain-pcdef", config.getRealmName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("foo")); - assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal")); assertTrue(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("foo", "foo")); assertFalse(config.isScopeValid("myPortal", "foo")); @@ -687,7 +898,7 @@ // Unregister the portal container rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml", "disable-pc"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); - assertNull(config.getPortalContainerName("foo")); + assertEquals("myPortal", config.getPortalContainerName("foo")); assertNull(config.getPortalContainerName("myPortal-pcdef")); assertFalse(config.isPortalContainerName("myPortal-pcdef")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); @@ -695,7 +906,9 @@ assertTrue(names != null && names.isEmpty()); assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(1, names.size()); + assertTrue(names.contains("myPortal")); } public void testSettings() Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-09-22 11:37:48 UTC (rev 3176) +++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-09-22 17:28:19 UTC (rev 3177) @@ -237,5 +237,24 @@ </values-param> </init-params> </component-plugin> - </external-component-plugins> + </external-component-plugins> + <external-component-plugins> +  + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin profiles="disable-pc2"> +  + <name>Disable a PortalContainer</name> +  + <set-method>registerDisablePlugin</set-method> +  + <type>org.exoplatform.container.definition.PortalContainerDefinitionDisablePlugin</type> + <init-params> +  + <values-param> + <name>names</name> + <value>myPortal-dpcdef</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml 2010-09-22 11:37:48 UTC (rev 3176) +++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def.xml 2010-09-22 17:28:19 UTC (rev 3177) @@ -79,5 +79,24 @@ </values-param> </init-params> </component-plugin> - </external-component-plugins> + </external-component-plugins> + <external-component-plugins> +  + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin profiles="disable-pc2"> +  + <name>Disable a PortalContainer</name> +  + <set-method>registerDisablePlugin</set-method> +  + <type>org.exoplatform.container.definition.PortalContainerDefinitionDisablePlugin</type> + <init-params> +  + <values-param> + <name>names</name> + <value>myPortal</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> \ No newline at end of file Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2010-09-22 11:37:48 UTC (rev 3176) +++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def2.xml 2010-09-22 17:28:19 UTC (rev 3177) @@ -68,6 +68,9 @@ <value> <string>foo3</string> </value> + <value profiles="disable-pc2"> + <string>myPortal</string> + </value> </collection> </field> </object> @@ -214,5 +217,24 @@ </values-param> </init-params> </component-plugin> - </external-component-plugins> + </external-component-plugins> + <external-component-plugins> +  + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin profiles="disable-pc2"> +  + <name>Disable a PortalContainer</name> +  + <set-method>registerDisablePlugin</set-method> +  + <type>org.exoplatform.container.definition.PortalContainerDefinitionDisablePlugin</type> + <init-params> +  + <values-param> + <name>names</name> + <value>myPortal</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> \ No newline at end of file

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3176 - in kernel/branches/2.2.3-CP01: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-22 07:37:48 -0400 (Wed, 22 Sep 2010) New Revision: 3176 Modified: kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml kernel/branches/2.2.3-CP01/packaging/module/pom.xml kernel/branches/2.2.3-CP01/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/branches/2.2.3-CP01/packaging/module/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/packaging/module/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/packaging/module/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/branches/2.2.3-CP01/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/pom.xml 2010-09-22 11:37:12 UTC (rev 3175) +++ kernel/branches/2.2.3-CP01/pom.xml 2010-09-22 11:37:48 UTC (rev 3176) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01</version> + <version>2.2.3-CP02-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-CP01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-CP01</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-CP01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.3-CP01</url> </scm> <modules>

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3175 - kernel/tags.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-22 07:37:12 -0400 (Wed, 22 Sep 2010) New Revision: 3175 Added: kernel/tags/2.2.3-CP01/ Log: [maven-scm] copy for tag 2.2.3-CP01 Copied: kernel/tags/2.2.3-CP01 (from rev 3174, kernel/branches/2.2.3-CP01)

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3174 - in kernel/branches/2.2.3-CP01: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-22 07:36:37 -0400 (Wed, 22 Sep 2010) New Revision: 3174 Modified: kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml kernel/branches/2.2.3-CP01/packaging/module/pom.xml kernel/branches/2.2.3-CP01/pom.xml Log: [maven-release-plugin] prepare release 2.2.3-CP01 Modified: kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/branches/2.2.3-CP01/packaging/module/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/packaging/module/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/packaging/module/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/branches/2.2.3-CP01/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/pom.xml 2010-09-22 11:26:10 UTC (rev 3173) +++ kernel/branches/2.2.3-CP01/pom.xml 2010-09-22 11:36:37 UTC (rev 3174) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-CP01-SNAPSHOT</version> + <version>2.2.3-CP01</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.3-CP01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-CP01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-CP01</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-CP01</url> </scm> <modules>

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3173 - in kernel/branches/2.2.3-CP01/exo.kernel.container/src: test/java/org/exoplatform/container/definition and 1 other directories.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2010-09-22 07:26:10 -0400 (Wed, 22 Sep 2010) New Revision: 3173 Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml Log: EXOJCR-974: 2 main changes have been applied: 1. For all the webapp not defined in any dependency list, PortalContainerConfig.getPortalContainerNames will return the list of all the portal containers and PortalContainerConfig.getPortalContainerName will return the default portal container. 2. The default portal container is considered as a known portal even if it has not been registered thanks to a component-plugin Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-09-22 07:48:29 UTC (rev 3172) +++ kernel/branches/2.2.3-CP01/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-09-22 11:26:10 UTC (rev 3173) @@ -18,6 +18,7 @@ */ package org.exoplatform.container.definition; +import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.container.PortalContainer; import org.exoplatform.container.PropertyConfigurator; import org.exoplatform.container.RootContainer; @@ -112,7 +113,7 @@ /** * The list of all the web application scopes */ - private Map<String, List<String>> scopes; + private Map<String, List<String>> scopes = Collections.unmodifiableMap(new HashMap<String, List<String>>()); /** * The list of all the {@link PortalContainerDefinition} that have been registered @@ -397,7 +398,7 @@ { throw new IllegalArgumentException("The context name cannot be null"); } - if (scopes.isEmpty()) + if (definitions.isEmpty()) { // we assume that the old behavior is expected final String portalContainerName = @@ -413,7 +414,8 @@ // The given context is a portal container return Collections.singletonList(contextName); } - return Collections.emptyList(); + // By default we scope it to all the portal containers + return portalContainerNames; } return result; } @@ -435,16 +437,22 @@ // The given context name is a context name of a portal container return contextName; } - else if (scopes.isEmpty()) + else if (definitions.isEmpty()) { // we assume that the old behavior is expected - return defaultDefinition.getName(); + return defaultDefinition.getName(); } final List<String> result = scopes.get(contextName); if (result == null || result.isEmpty()) { - // This context has not been added as dependency of any portal containers - return null; + // This context has not been added as dependency of any portal containers + if (PropertyManager.isDevelopping()) + { + log.debug("The context '" + contextName + "' has not been added as " + + "dependency of any portal containers"); + } + // by default we will return the default portal container + return defaultDefinition.getName(); } return result.get(0); } @@ -457,12 +465,18 @@ public List<String> getDependencies(String portalContainerName) { final PortalContainerDefinition definition = definitions.get(portalContainerName); - List<String> result = null; if (definition != null) { - result = definition.getDependencies(); + // A definition has been defined + List<String> result = definition.getDependencies(); + return result == null || result.isEmpty() ? defaultDefinition.getDependencies() : result; } - return result == null || result.isEmpty() ? defaultDefinition.getDependencies() : result; + else if (definitions.isEmpty()) + { + // The old behavior is expected + return defaultDefinition.getDependencies(); + } + return null; } /** @@ -542,7 +556,7 @@ if (portalContainerName == null) { throw new IllegalArgumentException("The portal container name cannot be null"); - } + } return getPortalContainerNames(contextName).contains(portalContainerName); } Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-09-22 07:48:29 UTC (rev 3172) +++ kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2010-09-22 11:26:10 UTC (rev 3173) @@ -30,7 +30,7 @@ * Created by The eXo Platform SAS * Author : Nicolas Filotto * nicolas.filotto(a)exoplatform.com - * 18 f�vr. 2010 + * 18 fﾎvr. 2010 */ public class TestPortalContainerConfig extends AbstractTestContainer { @@ -48,6 +48,9 @@ assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getDefaultPortalContainer()); assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getDefaultRestContext()); assertEquals(PortalContainerConfig.DEFAULT_REALM_NAME, config.getDefaultRealmName()); + assertTrue(config.isPortalContainerName("portal")); + assertFalse(config.isPortalContainerName("myPortal")); + assertFalse(config.isPortalContainerName("myPortal-dpcdef")); assertFalse(config.hasDefinition()); rootContainer = createRootContainer("portal-container-config-with-default-values.xml"); @@ -56,6 +59,9 @@ assertEquals("myPortal", config.getDefaultPortalContainer()); assertEquals("myRest", config.getDefaultRestContext()); assertEquals("my-exo-domain", config.getDefaultRealmName()); + assertFalse(config.isPortalContainerName("portal")); + assertTrue(config.isPortalContainerName("myPortal")); + assertFalse(config.isPortalContainerName("myPortal-dpcdef")); assertFalse(config.hasDefinition()); rootContainer = @@ -65,6 +71,9 @@ assertEquals("myPortal-dpcdef", config.getDefaultPortalContainer()); assertEquals("myRest-dpcdef", config.getDefaultRestContext()); assertEquals("my-exo-domain-dpcdef", config.getDefaultRealmName()); + assertFalse(config.isPortalContainerName("portal")); + assertFalse(config.isPortalContainerName("myPortal")); + assertTrue(config.isPortalContainerName("myPortal-dpcdef")); assertFalse(config.hasDefinition()); rootContainer = createRootContainer("portal-container-config-with-default-values-and-with-portal-def.xml"); @@ -234,12 +243,14 @@ assertTrue(names != null && !names.isEmpty()); assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0)); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0)); names = config.getPortalContainerNames("myPortal-pcdef"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, names.get(0)); assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); - assertNull(config.getPortalContainerName("myPortal-pcdef")); + assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("myPortal")); + assertEquals(PortalContainerConfig.DEFAULT_PORTAL_CONTAINER_NAME, config.getPortalContainerName("myPortal-pcdef")); assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("foo")); assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("myPortal")); assertEquals(PortalContainerConfig.DEFAULT_REST_CONTEXT_NAME, config.getRestContextName("myPortal-pcdef")); @@ -265,7 +276,9 @@ assertNull(config.getDependencies("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); assertTrue(names != null && !names.isEmpty()); - assertEquals("myPortal", names.get(0)); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal", names.get(0)); @@ -287,7 +300,7 @@ // Needed for backward compatibility assertFalse(config.isScopeValid("foo", "foo")); assertTrue(config.isScopeValid("myPortal", "foo")); - assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); + assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); assertTrue(config.isScopeValid("myPortal", "myPortal")); assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); assertTrue(config.hasDefinition()); @@ -328,7 +341,9 @@ assertNull(config.getDependencies("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); assertTrue(names != null && !names.isEmpty()); - assertEquals("myPortal", names.get(0)); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal", names.get(0)); @@ -350,7 +365,7 @@ // Needed for backward compatibility assertFalse(config.isScopeValid("foo", "foo")); assertTrue(config.isScopeValid("myPortal", "foo")); - assertFalse(config.isScopeValid("myPortal-pcdef", "foo")); + assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); assertTrue(config.isScopeValid("myPortal", "myPortal")); assertTrue(config.isScopeValid("myPortal-pcdef", "myPortal-pcdef")); assertTrue(config.hasDefinition()); @@ -360,9 +375,9 @@ createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); deps = config.getDependencies("foo"); - assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); + assertNull(deps); deps = config.getDependencies("myPortal"); - assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); + assertNull(deps); deps = config.getDependencies("myPortal-pcdef"); assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); names = config.getPortalContainerNames("fooX"); @@ -371,14 +386,20 @@ assertTrue(names.contains("myPortal-dpcdef")); assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); - assertNull(config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest-dpcdef", config.getRestContextName("foo")); assertEquals("myRest-dpcdef", config.getRestContextName("myPortal")); @@ -407,6 +428,10 @@ "with-profiles", profile); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); deps = config.getDependencies("foo"); + assertNull(deps); + deps = config.getDependencies("myPortal"); + assertNull(deps); + deps = config.getDependencies("myPortal-pcdef"); assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo")); int index = deps.indexOf("foo"); if (profile.equals("AddDependenciesBefore-No-Target") @@ -419,10 +444,6 @@ { assertEquals(1, index); } - deps = config.getDependencies("myPortal"); - assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo")); - deps = config.getDependencies("myPortal-pcdef"); - assertTrue(deps != null && deps.size() == 2 && deps.contains("fooX") && deps.contains("foo")); names = config.getPortalContainerNames("fooX"); assertTrue(names != null && !names.isEmpty()); assertEquals(2, names.size()); @@ -430,15 +451,19 @@ assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("foo"); assertTrue(names != null && !names.isEmpty()); - assertEquals(1, names.size()); - assertEquals("myPortal-dpcdef", names.get(0)); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal"); - assertTrue(names != null && names.isEmpty()); + assertTrue(names != null && !names.isEmpty()); + assertEquals(2, names.size()); + assertTrue(names.contains("myPortal-dpcdef")); + assertTrue(names.contains("myPortal-pcdef")); names = config.getPortalContainerNames("myPortal-pcdef"); assertTrue(names != null && !names.isEmpty()); assertEquals("myPortal-pcdef", names.get(0)); - assertEquals("myPortal-dpcdef", config.getPortalContainerName("foo")); - assertNull(config.getPortalContainerName("myPortal")); + assertEquals("myPortal-pcdef", config.getPortalContainerName("foo")); + assertEquals("myPortal-dpcdef", config.getPortalContainerName("myPortal")); assertEquals("myPortal-pcdef", config.getPortalContainerName("myPortal-pcdef")); assertEquals("myRest-dpcdef", config.getRestContextName("foo")); assertEquals("myRest-dpcdef", config.getRestContextName("myPortal")); @@ -487,7 +512,7 @@ assertFalse(config.isScopeValid("myPortal", "foo")); assertTrue(config.isScopeValid("myPortal-pcdef", "foo")); assertFalse(config.isScopeValid("myPortal-pcdef", "myPortal")); - assertFalse(config.isScopeValid("myPortal-pcdef", "fooY")); + assertTrue(config.isScopeValid("myPortal-pcdef", "fooY")); assertTrue(config.hasDefinition()); for (String profile : profiles) @@ -497,9 +522,9 @@ "with-profiles", profile); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); deps = config.getDependencies("foo"); - assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); + assertNull(deps); deps = config.getDependencies("myPortal"); - assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); + assertNull(deps); deps = config.getDependencies("myPortal-pcdef"); assertTrue(deps != null && deps.size() == 4); int index = deps.indexOf("fooX"); @@ -551,9 +576,9 @@ createRootContainer("portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def2.xml"); config = (PortalContainerConfig)rootContainer.getComponentInstanceOfType(PortalContainerConfig.class); deps = config.getDependencies("foo"); - assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); + assertNull(deps); deps = config.getDependencies("myPortal"); - assertTrue(deps != null && deps.size() == 1 && deps.contains("fooX")); + assertNull(deps); deps = config.getDependencies("myPortal-pcdef"); assertTrue(deps != null && deps.size() == 3); names = config.getPortalContainerNames("fooX"); Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-09-22 07:48:29 UTC (rev 3172) +++ kernel/branches/2.2.3-CP01/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-portal-def-with-default-portal-def.xml 2010-09-22 11:26:10 UTC (rev 3173) @@ -107,7 +107,7 @@ <values-param> <name>apply.specific</name> <value>fake</value> - <value>myPortal-dpcdef</value> + <value>myPortal-pcdef</value> </values-param> <object-param profiles="AddDependencies"> <name>change</name>

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3172 - in core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security: jaas and 1 other directories.

by do-not-reply＠jboss.org

Author: aparfonov Date: 2010-09-22 03:48:29 -0400 (Wed, 22 Sep 2010) New Revision: 3172 Modified: core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java Log: COR-213 : restore Identity fro authenticated users Modified: core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java 2010-09-21 15:39:20 UTC (rev 3171) +++ core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java 2010-09-22 07:48:29 UTC (rev 3172) @@ -25,10 +25,11 @@ import javax.security.auth.Subject; /** - * Created by The eXo Platform SAS .<br/> User Session encapsulates user's - * principals such as name, groups along with JAAS subject (useful in J2EE - * environment) as well as other optional attributes - * + * Created by The eXo Platform SAS .<br/> + * User Session encapsulates user's principals such as name, groups along with + * JAAS subject (useful in J2EE environment) as well as other optional + * attributes + * * @author Gennady Azarenkov * @version $Id: $ */ @@ -118,7 +119,7 @@ /** * Check is user member of group. - * + * * @param group the group. * @return true if user has any membershipType for given group, false * otherwise. @@ -159,7 +160,7 @@ /** * Sets the roles for J2EE environment using. - * + * * @param roles the roles. */ public void setRoles(Collection<String> roles) @@ -177,6 +178,9 @@ /** * @return @see {@link Subject} . + * @deprecated Do not need store subject any more. It was used before to + * perform logout, since tomcat 6.0.21 logout implemented in + * web-container. */ public Subject getSubject() { @@ -185,6 +189,7 @@ /** * @param subject @see {@link Subject} . + * @deprecated See {@link #getSubject()} */ public void setSubject(Subject subject) { @@ -193,7 +198,7 @@ /** * Check is given {@link MembershipEntry} presents in user's memberships. - * + * * @param checkMe the MembershipEntry. * @return true if presents false otherwise. */ Modified: core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2010-09-21 15:39:20 UTC (rev 3171) +++ core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2010-09-22 07:48:29 UTC (rev 3172) @@ -34,7 +34,7 @@ /** * Created by The eXo Platform SAS . - * + * * @author Gennady Azarenkov * @version $Id: $ */ @@ -53,8 +53,8 @@ protected Identity identity; /** - * Is allowed for one user login again if he already login. - * If must set in LM options. + * Is allowed for one user login again if he already login. If must set in LM + * options. */ protected boolean singleLogin; @@ -66,7 +66,7 @@ } /** - * {@inheritDoc} + * {@inheritDoc} */ public void afterInitialize() { @@ -130,7 +130,7 @@ { log.debug(e.getMessage()); } - + throw new LoginException(e.getMessage()); } } @@ -149,6 +149,10 @@ if (singleLogin && identityRegistry.getIdentity(identity.getUserId()) != null) throw new LoginException("User " + identity.getUserId() + " already logined."); + // TODO Remove subject from identity if nod need it in eXo environment. + // Do not need implement logout by self if use tomcat 6.0.21 and later. + // See deprecation comments in + // org.exoplatform.services.security.web.JAASConversationStateListener identity.setSubject(subject); identityRegistry.register(identity); Modified: core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2010-09-21 15:39:20 UTC (rev 3171) +++ core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2010-09-22 07:48:29 UTC (rev 3172) @@ -36,7 +36,7 @@ * Required name of user MUST be passed to LM via sharedState (see method * {@link #initialize(Subject, CallbackHandler, Map, Map)}), with name * javax.security.auth.login.name. - * + * * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ */ @@ -92,6 +92,10 @@ throw new LoginException("User " + userId + " already logined."); Identity identity = authenticator.createIdentity(userId); + // TODO Remove subject from identity if nod need it in eXo environment. + // Do not need implement logout by self if use tomcat 6.0.21 and later. + // See deprecation comments in + // org.exoplatform.services.security.web.JAASConversationStateListener identity.setSubject(subject); identityRegistry.register(identity); Modified: core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java 2010-09-21 15:39:20 UTC (rev 3171) +++ core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java 2010-09-22 07:48:29 UTC (rev 3172) @@ -32,6 +32,13 @@ /** * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ + * @deprecated Since use tomcat as default web-container do need use this + * listener any more. In tomcat 6.0.21 and later logout already + * implemented in + * <strong>org.apache.catalina.realm.GenericPrincipal</strong>. + * Detains described <a + * href="https://issues.apache.org/bugzilla/show_bug.cgi?id=39231" + * >here</a> . Should use {@link ConversationStateListener} instead. */ public class JAASConversationStateListener extends ConversationStateListener { @@ -67,10 +74,12 @@ } else { - log.warn("Subject was not found in ConversationState attributes."); + if (log.isDebugEnabled()) + { + log.warn("Subject was not found in ConversationState attributes."); + } } } - } catch (Exception e) { Modified: core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java =================================================================== --- core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java 2010-09-21 15:39:20 UTC (rev 3171) +++ core/branches/2.3.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java 2010-09-22 07:48:29 UTC (rev 3172) @@ -23,6 +23,7 @@ import org.exoplatform.container.web.AbstractFilter; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.security.Authenticator; import org.exoplatform.services.security.ConversationRegistry; import org.exoplatform.services.security.ConversationState; import org.exoplatform.services.security.Identity; @@ -32,6 +33,7 @@ import java.io.IOException; import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -40,21 +42,33 @@ /** * Created by The eXo Platform SAS . - * + * * @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady * Azarenkov</a> - * @version $Id: SimpleSessionFactoryInitializedFilter.java 7163 2006-07-19 - * 07:30:39Z peterit $ + * @version $Id: SetCurrentIdentityFilter.java 7163 2006-07-19 07:30:39Z peterit + * $ */ public class SetCurrentIdentityFilter extends AbstractFilter { + private boolean restoreIdentity; + /** * Logger. */ private static Log log = ExoLogger.getLogger("exo.core.component.security.core.SetCurrentIdentityFilter"); /** + * {@inheritDoc} + */ + @Override + protected void afterInit(FilterConfig config) throws ServletException + { + super.afterInit(config); + restoreIdentity = Boolean.parseBoolean(config.getInitParameter("restoreIdentity")); + } + + /** * Set current {@link ConversationState}, if it is not registered yet then * create new one and register in {@link ConversationRegistry}. {@inheritDoc} */ @@ -134,12 +148,42 @@ if (identity != null) { state = new ConversationState(identity); - // keep subject as attribute in ConversationState + // Keep subject as attribute in ConversationState. + // TODO remove this, do not need it any more. state.setAttribute(ConversationState.SUBJECT, identity.getSubject()); } else - log.error("Not found identity in IdentityRegistry for user " + userId + ", check Login Module."); + { + if (restoreIdentity) + { + if (log.isDebugEnabled()) + { + log.debug("Not found identity for " + userId + " try to restore it. "); + } + Authenticator authenticator = + (Authenticator)container.getComponentInstanceOfType(Authenticator.class); + try + { + identity = authenticator.createIdentity(userId); + identityRegistry.register(identity); + } + catch (Exception e) + { + log.error("Unable restore identity. " + e.getMessage(), e); + } + + if (identity != null) + { + state = new ConversationState(identity); + } + } + else + { + log.error("Not found identity in IdentityRegistry for user " + userId + ", check Login Module."); + } + } + if (state != null) { conversationRegistry.register(stateKey, state); @@ -147,7 +191,6 @@ { log.debug("Register Conversation state " + httpSession.getId()); } - } } }

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3171 - in kernel/branches/2.2.3-CP01: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-21 11:39:20 -0400 (Tue, 21 Sep 2010) New Revision: 3171 Modified: kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml kernel/branches/2.2.3-CP01/packaging/module/pom.xml kernel/branches/2.2.3-CP01/pom.xml Log: EXOJCR-975: change version to 2.2.3-CP01-SNAPSHOT Modified: kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.commons/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.cache/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.cache</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.command/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.command</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.common/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> <name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name> Modified: kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.component.remote/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.container/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> <name>eXo Kernel :: Container</name> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-demo</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-int-tests</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>exo.kernel.mc-kernel-extras</artifactId> Modified: kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/exo.kernel.mc-integration/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/branches/2.2.3-CP01/packaging/module/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/packaging/module/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/packaging/module/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/branches/2.2.3-CP01/pom.xml =================================================================== --- kernel/branches/2.2.3-CP01/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) +++ kernel/branches/2.2.3-CP01/pom.xml 2010-09-21 15:39:20 UTC (rev 3171) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> + <version>2.2.3-CP01-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Kernel</name>

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3170 - kernel/tags/2.2.3-GA.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-21 11:33:38 -0400 (Tue, 21 Sep 2010) New Revision: 3170 Modified: kernel/tags/2.2.3-GA/pom.xml Log: [maven-release-plugin] prepare release 2.2.3-CP01 Modified: kernel/tags/2.2.3-GA/pom.xml =================================================================== --- kernel/tags/2.2.3-GA/pom.xml 2010-09-21 15:33:23 UTC (rev 3169) +++ kernel/tags/2.2.3-GA/pom.xml 2010-09-21 15:33:38 UTC (rev 3170) @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.3-CP01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-GA</url> </scm> <modules>

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3169 - in kernel/branches: 2.2.3-CP01 and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-21 11:33:23 -0400 (Tue, 21 Sep 2010) New Revision: 3169 Added: kernel/branches/2.2.3-CP01/ kernel/branches/2.2.3-CP01/pom.xml Removed: kernel/branches/2.2.3-CP01/pom.xml Log: [maven-release-plugin] copy for branch 2.2.3-CP01 Copied: kernel/branches/2.2.3-CP01 (from rev 3142, kernel/tags/2.2.3-GA) Deleted: kernel/branches/2.2.3-CP01/pom.xml =================================================================== --- kernel/tags/2.2.3-GA/pom.xml 2010-09-21 07:42:01 UTC (rev 3142) +++ kernel/branches/2.2.3-CP01/pom.xml 2010-09-21 15:33:23 UTC (rev 3169) @@ -1,215 +0,0 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform</groupId> - <artifactId>foundation-parent</artifactId> - <version>7</version> - </parent> - - <groupId>org.exoplatform.kernel</groupId> - <artifactId>kernel-parent</artifactId> - <version>2.2.3-GA</version> - <packaging>pom</packaging> - - <name>eXo Kernel</name> - - <properties> - <exo.product.name>exo-kernel</exo.product.name> - <exo.product.specification>2.2</exo.product.specification> - <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> - <forkMode>always</forkMode> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-GA</url> - </scm> - - <modules> - <module>exo.kernel.container</module> - <module>exo.kernel.commons</module> - <module>exo.kernel.component.common</module> - <module>exo.kernel.component.remote</module> - <module>exo.kernel.component.cache</module> - <module>exo.kernel.component.ext.cache.impl.jboss.v3</module> - <module>exo.kernel.component.command</module> - <module>exo.kernel.mc-integration</module> - <module>packaging/module</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - <version>${org.exoplatform.framework.junit.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.remote</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.3.4.O</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - </dependency> - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.8</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> - </dependency> - <dependency> - <groupId>quartz</groupId> - <artifactId>quartz</artifactId> - <version>1.5.2</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.2</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1B</version> - </dependency> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.13.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.2.4.GA</version> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-bind</artifactId> - <version>${version.jibx.plugin}</version> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-extras</artifactId> - <version>${version.jibx.plugin}</version> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-run</artifactId> - <version>${version.jibx.plugin}</version> - </dependency> - <dependency> - <groupId>jotm</groupId> - <artifactId>jotm</artifactId> - <version>2.0.10</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -</project> Copied: kernel/branches/2.2.3-CP01/pom.xml (from rev 3168, kernel/tags/2.2.3-GA/pom.xml) =================================================================== --- kernel/branches/2.2.3-CP01/pom.xml (rev 0) +++ kernel/branches/2.2.3-CP01/pom.xml 2010-09-21 15:33:23 UTC (rev 3169) @@ -0,0 +1,215 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform</groupId> + <artifactId>foundation-parent</artifactId> + <version>7</version> + </parent> + + <groupId>org.exoplatform.kernel</groupId> + <artifactId>kernel-parent</artifactId> + <version>2.2.3-GA</version> + <packaging>pom</packaging> + + <name>eXo Kernel</name> + + <properties> + <exo.product.name>exo-kernel</exo.product.name> + <exo.product.specification>2.2</exo.product.specification> + <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> + <forkMode>always</forkMode> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.3-CP01</url> + </scm> + + <modules> + <module>exo.kernel.container</module> + <module>exo.kernel.commons</module> + <module>exo.kernel.component.common</module> + <module>exo.kernel.component.remote</module> + <module>exo.kernel.component.cache</module> + <module>exo.kernel.component.ext.cache.impl.jboss.v3</module> + <module>exo.kernel.component.command</module> + <module>exo.kernel.mc-integration</module> + <module>packaging/module</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + <version>${org.exoplatform.framework.junit.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + </dependency> + <dependency> + <groupId>quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.5.2</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.13.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.4.GA</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <version>${version.jibx.plugin}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-extras</artifactId> + <version>${version.jibx.plugin}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>${version.jibx.plugin}</version> + </dependency> + <dependency> + <groupId>jotm</groupId> + <artifactId>jotm</artifactId> + <version>2.0.10</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project>

13 years, 8 months

1
0
0 / 0

exo-jcr SVN: r3168 - kernel/tags/2.2.3-GA.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-09-21 11:33:02 -0400 (Tue, 21 Sep 2010) New Revision: 3168 Modified: kernel/tags/2.2.3-GA/pom.xml Log: [maven-release-plugin] prepare branch 2.2.3-CP01 Modified: kernel/tags/2.2.3-GA/pom.xml =================================================================== --- kernel/tags/2.2.3-GA/pom.xml 2010-09-21 13:52:18 UTC (rev 3167) +++ kernel/tags/2.2.3-GA/pom.xml 2010-09-21 15:33:02 UTC (rev 3168) @@ -43,9 +43,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.3-GA</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.3-GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.3-CP01</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.3-CP01</url> </scm> <modules>

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits September 2010