exo-jcr SVN: r4711 - jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1636.
by do-not-reply@jboss.org
Author: areshetnyak
Date: 2011-08-09 03:45:19 -0400 (Tue, 09 Aug 2011)
New Revision: 4711
Modified:
jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1636/JCR-1636.patch
Log:
JCR-1636: The patch was updated. Changes from issue EXOJCR-1464 was added in patch JCR-1636.patch
Modified: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1636/JCR-1636.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1636/JCR-1636.patch 2011-08-09 06:23:45 UTC (rev 4710)
+++ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1636/JCR-1636.patch 2011-08-09 07:45:19 UTC (rev 4711)
@@ -348,7 +348,7 @@
===================================================================
--- exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java (revision 0)
+++ exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java (revision 0)
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2003-2011 eXo Platform SAS.
+ *
@@ -492,21 +492,91 @@
+ //ok
+ }
+ }
++
++ public void testCreateSystemSessionProviderAfterDynamic() throws Exception
++ {
++ // System only node.
++ NodeImpl systemNode = (NodeImpl) testRoot.addNode("system_dynamic");
++ systemNode.addMixin("exo:privilegeable");
++
++ systemNode.setPermission("*:/platform/users", new String[]
++ {PermissionType.READ});
++ systemNode.removePermission(session.getUserID());
++ testRoot.save();
++
++
++ //Dynamic session successful read
++ List<AccessControlEntry> accessControlEntries = new ArrayList<AccessControlEntry>();
++ accessControlEntries.add(new AccessControlEntry("*:/platform/users", "READ"));
++ SessionProvider dynamicProvider = SessionProvider.createProvider(accessControlEntries);
++
++ Session dynamicSession = null;
++
++ //check get
++ try
++ {
++ dynamicSession = dynamicProvider.getSession(session.getWorkspace().getName(), repository);
++ NodeImpl maryNodeDynamic = (NodeImpl) dynamicSession.getItem(systemNode.getPath());
++ //ok
++ }
++ catch (AccessDeniedException e)
++ {
++ e.printStackTrace();
++ fail("Dynamic session with membership '*:/platform/users' should read node with membership '*:/platform/users'. Exception message : "
++ + e.getMessage());
++ }
++
++ //System provider successful read
++ SessionProvider systemProvider = SessionProvider.createSystemProvider();
++ Session systemSession = null;
++ try
++ {
++ systemSession = systemProvider.getSession(session.getWorkspace().getName(), repository);
++ NodeImpl systemNodeOverSystemSession = (NodeImpl) systemSession.getItem(systemNode.getPath());
++ //ok
++ }
++ catch (AccessDeniedException e)
++ {
++ e.printStackTrace();
++ fail("System session should read node with membership '*:/platform/users'. Exception message : "
++ + e.getMessage());
++ }
++
++ //check remove
++ try
++ {
++ systemSession = systemProvider.getSession(session.getWorkspace().getName(), repository);
++ NodeImpl systemNodeOverSystemSession = (NodeImpl) systemSession.getItem(systemNode.getPath());
++
++ systemNodeOverSystemSession.remove();
++ systemSession.save();
++ //ok
++ }
++ catch (AccessDeniedException e)
++ {
++ fail("System session should remove node with membership '*:/platform/users'.");
++ }
++
++ }
+}
Index: exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java
===================================================================
--- exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java (revision 4449)
+++ exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java (working copy)
-@@ -18,6 +18,8 @@
+@@ -18,16 +18,19 @@
*/
package org.exoplatform.services.jcr.ext.common;
+-import org.exoplatform.services.jcr.access.SystemIdentity;
+import org.exoplatform.services.jcr.access.AccessControlEntry;
+import org.exoplatform.services.jcr.access.DynamicIdentity;
- import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.ExtendedSession;
import org.exoplatform.services.jcr.core.ManageableRepository;
-@@ -28,6 +30,7 @@
+ import org.exoplatform.services.jcr.core.SessionLifecycleListener;
+ import org.exoplatform.services.security.ConversationState;
+ import org.exoplatform.services.security.Identity;
++import org.exoplatform.services.security.IdentityConstants;
+ import org.exoplatform.services.security.MembershipEntry;
import java.util.HashMap;
import java.util.HashSet;
@@ -514,7 +584,40 @@
import java.util.Map;
import javax.jcr.LoginException;
-@@ -113,6 +116,29 @@
+@@ -67,6 +70,8 @@
+ private String currentWorkspace;
+
+ private boolean closed;
++
++ private ConversationState conversationState;
+
+ /**
+ * Creates SessionProvider for certain identity.
+@@ -81,6 +86,18 @@
+ }
+
+ /**
++ * Creates SessionProvider for a dynamic identity.
++ *
++ * @param membershipEntries the expected memberships
++ */
++ private SessionProvider(HashSet<MembershipEntry> membershipEntries)
++ {
++ this(false);
++ Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries);
++ this.conversationState = new ConversationState(id);
++ }
++
++ /**
+ * Internal constructor.
+ *
+ * @param isSystem
+@@ -109,10 +126,29 @@
+ */
+ public static SessionProvider createAnonimProvider()
+ {
+- Identity id = new Identity(SystemIdentity.ANONIM, new HashSet<MembershipEntry>());
++ Identity id = new Identity(IdentityConstants.ANONIM, new HashSet<MembershipEntry>());
return new SessionProvider(new ConversationState(id));
}
@@ -532,11 +635,7 @@
+ {
+ membershipEntries.add(ace.getMembershipEntry());
+ }
-+
-+ Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries);
-+ ConversationState conversationState = new ConversationState(id);
-+ ConversationState.setCurrent(conversationState);
-+ return new SessionProvider(conversationState);
++ return new SessionProvider(membershipEntries);
+ }
+
+ }
@@ -544,14 +643,13 @@
/**
* Gets the session from internal cache or creates and caches new one.
*
-@@ -142,11 +168,19 @@
+@@ -142,11 +178,18 @@
if (session == null)
{
-
- if (!isSystem)
-+ ConversationState conversationState = ConversationState.getCurrent();
-+ if (conversationState != null && conversationState.getIdentity().getUserId().equals(DynamicIdentity.DYNAMIC))
++ if (conversationState != null)
+ {
+ session = (ExtendedSession) repository.getDynamicSession(workspaceName, conversationState.getIdentity().getMemberships());
+ }
12 years, 9 months
exo-jcr SVN: r4710 - kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming.
by do-not-reply@jboss.org
Author: areshetnyak
Date: 2011-08-09 02:23:45 -0400 (Tue, 09 Aug 2011)
New Revision: 4710
Modified:
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java
Log:
EXOJCR-1465 : Wrong committee was reverted.
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2011-08-09 04:37:00 UTC (rev 4709)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/SimpleContext.java 2011-08-09 06:23:45 UTC (rev 4710)
@@ -66,7 +66,6 @@
public SimpleContext()
{
- System.out.println("SimpleContext() : " + Thread.currentThread().getName());
}
protected Map<String, Object> getBindings()
@@ -77,8 +76,6 @@
protected void setBindings(Map<String, Object> bindings)
{
BINDINGS = bindings;
-
- System.out.println("setBindings(Map<String, Object> bindings) : " + Thread.currentThread().getName());
}
/**
@@ -102,8 +99,6 @@
*/
public Object lookup(String name) throws NamingException
{
- System.out.println("lookup(String name) : " + Thread.currentThread().getName());
-
if (name.isEmpty())
{
throw new InvalidNameException("Cannot bind empty name");
@@ -416,7 +411,6 @@
protected Object getMutex()
{
- System.out.println("getMutex() : " + Thread.currentThread().getName());
return SimpleContext.class;
}
12 years, 9 months
exo-jcr SVN: r4709 - jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common.
by do-not-reply@jboss.org
Author: paristote
Date: 2011-08-09 00:37:00 -0400 (Tue, 09 Aug 2011)
New Revision: 4709
Modified:
jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java
Log:
PLF-1897 commit change for EXOJCR-1464
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-08-09 04:36:14 UTC (rev 4708)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-08-09 04:37:00 UTC (rev 4709)
@@ -20,12 +20,12 @@
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.DynamicIdentity;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.ExtendedSession;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.SessionLifecycleListener;
import org.exoplatform.services.security.ConversationState;
import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.MembershipEntry;
import java.util.HashMap;
@@ -70,6 +70,8 @@
private String currentWorkspace;
private boolean closed;
+
+ private ConversationState conversationState;
/**
* Creates SessionProvider for certain identity.
@@ -84,6 +86,18 @@
}
/**
+ * Creates SessionProvider for a dynamic identity.
+ *
+ * @param membershipEntries the expected memberships
+ */
+ private SessionProvider(HashSet<MembershipEntry> membershipEntries)
+ {
+ this(false);
+ Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries);
+ this.conversationState = new ConversationState(id);
+ }
+
+ /**
* Internal constructor.
*
* @param isSystem
@@ -112,7 +126,7 @@
*/
public static SessionProvider createAnonimProvider()
{
- Identity id = new Identity(SystemIdentity.ANONIM, new HashSet<MembershipEntry>());
+ Identity id = new Identity(IdentityConstants.ANONIM, new HashSet<MembershipEntry>());
return new SessionProvider(new ConversationState(id));
}
@@ -130,11 +144,7 @@
{
membershipEntries.add(ace.getMembershipEntry());
}
-
- Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries);
- ConversationState conversationState = new ConversationState(id);
- ConversationState.setCurrent(conversationState);
- return new SessionProvider(conversationState);
+ return new SessionProvider(membershipEntries);
}
}
@@ -168,8 +178,7 @@
if (session == null)
{
- ConversationState conversationState = ConversationState.getCurrent();
- if (conversationState != null && conversationState.getIdentity().getUserId().equals(DynamicIdentity.DYNAMIC))
+ if (conversationState != null)
{
session =
(ExtendedSession) repository.getDynamicSession(workspaceName, conversationState.getIdentity()
12 years, 9 months
exo-jcr SVN: r4708 - in jcr/tags/1.14.0-CR4-CP01: applications and 25 other directories.
by do-not-reply@jboss.org
Author: paristote
Date: 2011-08-09 00:36:14 -0400 (Tue, 09 Aug 2011)
New Revision: 4708
Modified:
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.browser/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.config/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jboss/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jetty/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jonas/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.rest/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.tomcat/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.cluster.testclient/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.ear/pom.xml
jcr/tags/1.14.0-CR4-CP01/applications/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.core/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ftp/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.statistics/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.webdav/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.connectors.jca/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.command/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.ftpclient/pom.xml
jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.web/pom.xml
jcr/tags/1.14.0-CR4-CP01/packaging/module/pom.xml
jcr/tags/1.14.0-CR4-CP01/pom.xml
Log:
PLF-1897 update version in pom.xml files
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole.dist</artifactId>
<name>eXo JCR :: Applications :: Backup Console Binary Distribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.browser/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.browser/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.config/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.config/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jboss/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jboss/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jetty/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jetty/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jonas/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.jonas/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.rest/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.rest/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.tomcat/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.applications.tomcat/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.ear/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/exo.jcr.ear/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/applications/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/applications/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/applications/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.core/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.core/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ext/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ftp/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.ftp/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.statistics/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.statistics/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.webdav/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.component.webdav/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.connectors.jca/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.connectors.jca/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.connectors.jca/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.connectors.jca</artifactId>
<packaging>rar</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.docs/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.command/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.command/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.ftpclient/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.ftpclient/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.web/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/exo.jcr.framework.web/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/tags/1.14.0-CR4-CP01/packaging/module/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/packaging/module/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/packaging/module/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/tags/1.14.0-CR4-CP01/pom.xml
===================================================================
--- jcr/tags/1.14.0-CR4-CP01/pom.xml 2011-08-09 04:26:27 UTC (rev 4707)
+++ jcr/tags/1.14.0-CR4-CP01/pom.xml 2011-08-09 04:36:14 UTC (rev 4708)
@@ -29,20 +29,20 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-CR4</version>
+ <version>1.14.0-CR4-CP01</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-CR4</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-CR4</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.0-CR4</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-CR4-CP01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-CR4-CP01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.0-CR4-CP01</url>
</scm>
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.14</exo.product.specification>
- <org.exoplatform.kernel.version>2.3.0-CR4</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3.0-CR4-CP01</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.4.0-CR4</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.0-CR4</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
12 years, 9 months
exo-jcr SVN: r4707 - kernel/tags/2.3.0-CR4-CP01/packaging/module/src/main/javascript.
by do-not-reply@jboss.org
Author: paristote
Date: 2011-08-09 00:26:27 -0400 (Tue, 09 Aug 2011)
New Revision: 4707
Modified:
kernel/tags/2.3.0-CR4-CP01/packaging/module/src/main/javascript/kernel.packaging.module.js
Log:
PLF-1897 commit change for EXOJCR-1461
Modified: kernel/tags/2.3.0-CR4-CP01/packaging/module/src/main/javascript/kernel.packaging.module.js
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-08-09 04:24:38 UTC (rev 4706)
+++ kernel/tags/2.3.0-CR4-CP01/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-08-09 04:26:27 UTC (rev 4707)
@@ -12,6 +12,7 @@
module.commons =
new Project("org.exoplatform.kernel", "exo.kernel.commons", "jar", module.version).
addDependency(new Project("commons-lang", "commons-lang", "jar", "2.6")).
+ addDependency(new Project("eu.medsea.mimeutil", "mime-util", "jar", "2.1.3")).
addDependency(new Project("xpp3", "xpp3", "jar", "1.1.4c")).
addDependency(new Project("dom4j", "dom4j", "jar", "1.6.1"));
12 years, 9 months
exo-jcr SVN: r4706 - in kernel/tags/2.3.0-CR4-CP01: exo.kernel.commons and 13 other directories.
by do-not-reply@jboss.org
Author: paristote
Date: 2011-08-09 00:24:38 -0400 (Tue, 09 Aug 2011)
New Revision: 4706
Modified:
kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons.test/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.cache/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.command/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.common/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.container/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/pom.xml
kernel/tags/2.3.0-CR4-CP01/packaging/module/pom.xml
kernel/tags/2.3.0-CR4-CP01/pom.xml
Log:
PLF-1897 update version in pom.xml files
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons.test/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.commons.test/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.cache/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.cache/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.command/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.command/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.common/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.common/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v4</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.container/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.container/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.container/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/exo.kernel.mc-integration/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/tags/2.3.0-CR4-CP01/packaging/module/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/packaging/module/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/packaging/module/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-CP01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/tags/2.3.0-CR4-CP01/pom.xml
===================================================================
--- kernel/tags/2.3.0-CR4-CP01/pom.xml 2011-08-09 04:16:34 UTC (rev 4705)
+++ kernel/tags/2.3.0-CR4-CP01/pom.xml 2011-08-09 04:24:38 UTC (rev 4706)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-CR4-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/tags/2.3.0-CR4</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.0-CR4</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.0-CR4</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.3.0-CR4-CP01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.0-CR4-CP01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.0-CR4-CP01</url>
</scm>
<modules>
12 years, 9 months
exo-jcr SVN: r4705 - kernel/tags.
by do-not-reply@jboss.org
Author: paristote
Date: 2011-08-09 00:16:34 -0400 (Tue, 09 Aug 2011)
New Revision: 4705
Added:
kernel/tags/2.3.0-CR4-CP01/
Log:
PLF-1897 copy the kernel tag 2.3.0-CR4 to 2.3.0-CR4-CP01
12 years, 9 months
exo-jcr SVN: r4704 - jcr/tags.
by do-not-reply@jboss.org
Author: paristote
Date: 2011-08-08 23:16:26 -0400 (Mon, 08 Aug 2011)
New Revision: 4704
Added:
jcr/tags/1.14.0-CR4-CP01/
Log:
PLF-1897 copy tag v1.14.0-CR4 to v1.14.0-CR4-CP01
12 years, 9 months
exo-jcr SVN: r4703 - jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common.
by do-not-reply@jboss.org
Author: areshetnyak
Date: 2011-08-08 10:25:06 -0400 (Mon, 08 Aug 2011)
New Revision: 4703
Modified:
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java
Log:
EXOJCR-1464 : Use case of creating SystemSessionProvider after creating DynamicSession in the same thread was added in DynamicSessionProviderTest.
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java 2011-08-08 13:25:20 UTC (rev 4702)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java 2011-08-08 14:25:06 UTC (rev 4703)
@@ -144,4 +144,70 @@
//ok
}
}
+
+ public void testCreateSystemSessionProviderAfterDynamic() throws Exception
+ {
+ // System only node.
+ NodeImpl systemNode = (NodeImpl) testRoot.addNode("system_dynamic");
+ systemNode.addMixin("exo:privilegeable");
+
+ systemNode.setPermission("*:/platform/users", new String[]
+ {PermissionType.READ});
+ systemNode.removePermission(session.getUserID());
+ testRoot.save();
+
+
+ //Dynamic session successful read
+ List<AccessControlEntry> accessControlEntries = new ArrayList<AccessControlEntry>();
+ accessControlEntries.add(new AccessControlEntry("*:/platform/users", "READ"));
+ SessionProvider dynamicProvider = SessionProvider.createProvider(accessControlEntries);
+
+ Session dynamicSession = null;
+
+ //check get
+ try
+ {
+ dynamicSession = dynamicProvider.getSession(session.getWorkspace().getName(), repository);
+ NodeImpl maryNodeDynamic = (NodeImpl) dynamicSession.getItem(systemNode.getPath());
+ //ok
+ }
+ catch (AccessDeniedException e)
+ {
+ e.printStackTrace();
+ fail("Dynamic session with membership '*:/platform/users' should read node with membership '*:/platform/users'. Exception message : "
+ + e.getMessage());
+ }
+
+ //System provider successful read
+ SessionProvider systemProvider = SessionProvider.createSystemProvider();
+ Session systemSession = null;
+ try
+ {
+ systemSession = systemProvider.getSession(session.getWorkspace().getName(), repository);
+ NodeImpl systemNodeOverSystemSession = (NodeImpl) systemSession.getItem(systemNode.getPath());
+ //ok
+ }
+ catch (AccessDeniedException e)
+ {
+ e.printStackTrace();
+ fail("System session should read node with membership '*:/platform/users'. Exception message : "
+ + e.getMessage());
+ }
+
+ //check remove
+ try
+ {
+ systemSession = systemProvider.getSession(session.getWorkspace().getName(), repository);
+ NodeImpl systemNodeOverSystemSession = (NodeImpl) systemSession.getItem(systemNode.getPath());
+
+ systemNodeOverSystemSession.remove();
+ systemSession.save();
+ //ok
+ }
+ catch (AccessDeniedException e)
+ {
+ fail("System session should remove node with membership '*:/platform/users'.");
+ }
+
+ }
}
12 years, 9 months
exo-jcr SVN: r4702 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common.
by do-not-reply@jboss.org
Author: areshetnyak
Date: 2011-08-08 09:25:20 -0400 (Mon, 08 Aug 2011)
New Revision: 4702
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java
Log:
EXOJCR-1464 : Changes from EXOJCR-1464.patch was committed.
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-08-08 12:24:10 UTC (rev 4701)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-08-08 13:25:20 UTC (rev 4702)
@@ -20,12 +20,12 @@
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.DynamicIdentity;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.ExtendedSession;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.SessionLifecycleListener;
import org.exoplatform.services.security.ConversationState;
import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.MembershipEntry;
import java.util.HashMap;
@@ -70,6 +70,8 @@
private String currentWorkspace;
private boolean closed;
+
+ private ConversationState conversationState;
/**
* Creates SessionProvider for certain identity.
@@ -84,6 +86,18 @@
}
/**
+ * Creates SessionProvider for a dynamic identity.
+ *
+ * @param membershipEntries the expected memberships
+ */
+ private SessionProvider(HashSet<MembershipEntry> membershipEntries)
+ {
+ this(false);
+ Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries);
+ this.conversationState = new ConversationState(id);
+ }
+
+ /**
* Internal constructor.
*
* @param isSystem
@@ -112,7 +126,7 @@
*/
public static SessionProvider createAnonimProvider()
{
- Identity id = new Identity(SystemIdentity.ANONIM, new HashSet<MembershipEntry>());
+ Identity id = new Identity(IdentityConstants.ANONIM, new HashSet<MembershipEntry>());
return new SessionProvider(new ConversationState(id));
}
@@ -130,11 +144,7 @@
{
membershipEntries.add(ace.getMembershipEntry());
}
-
- Identity id = new Identity(DynamicIdentity.DYNAMIC, membershipEntries);
- ConversationState conversationState = new ConversationState(id);
- ConversationState.setCurrent(conversationState);
- return new SessionProvider(conversationState);
+ return new SessionProvider(membershipEntries);
}
}
@@ -168,8 +178,7 @@
if (session == null)
{
- ConversationState conversationState = ConversationState.getCurrent();
- if (conversationState != null && conversationState.getIdentity().getUserId().equals(DynamicIdentity.DYNAMIC))
+ if (conversationState != null)
{
session =
(ExtendedSession) repository.getDynamicSession(workspaceName, conversationState.getIdentity()
12 years, 9 months