exo-jcr SVN: r4971 - in core/trunk: exo.core.component.database and 10 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 06:21:18 -0400 (Mon, 26 Sep 2011)
New Revision: 4971
Modified:
core/trunk/exo.core.component.database/pom.xml
core/trunk/exo.core.component.document/pom.xml
core/trunk/exo.core.component.ldap/pom.xml
core/trunk/exo.core.component.organization.api/pom.xml
core/trunk/exo.core.component.organization.jdbc/pom.xml
core/trunk/exo.core.component.organization.ldap/pom.xml
core/trunk/exo.core.component.script.groovy/pom.xml
core/trunk/exo.core.component.security.core/pom.xml
core/trunk/exo.core.component.web.css/pom.xml
core/trunk/exo.core.component.xml-processing/pom.xml
core/trunk/packaging/module/pom.xml
core/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.database/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/trunk/exo.core.component.document/pom.xml
===================================================================
--- core/trunk/exo.core.component.document/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.document/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/trunk/exo.core.component.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.ldap/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.ldap/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/trunk/exo.core.component.organization.api/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.api/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.organization.api/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/trunk/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.ldap/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.organization.ldap/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/trunk/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/trunk/exo.core.component.script.groovy/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.script.groovy/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/trunk/exo.core.component.security.core/pom.xml
===================================================================
--- core/trunk/exo.core.component.security.core/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.security.core/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/trunk/exo.core.component.web.css/pom.xml
===================================================================
--- core/trunk/exo.core.component.web.css/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.web.css/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/trunk/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/trunk/exo.core.component.xml-processing/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/exo.core.component.xml-processing/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/trunk/packaging/module/pom.xml
===================================================================
--- core/trunk/packaging/module/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/packaging/module/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,13 +18,13 @@
<!-- declare the same dependencies than in the module.js -->
<dependencies>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.1-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.1-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.1-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.1-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.1-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.1-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.2-GA-SNAPSHOT</version></dependency>
</dependencies>
<build>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-09-26 10:20:54 UTC (rev 4970)
+++ core/trunk/pom.xml 2011-09-26 10:21:18 UTC (rev 4971)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA</version>
+ <version>2.4.2-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Core</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.4.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.4.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.4.1-GA</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url>
</scm>
<modules>
12 years, 8 months
exo-jcr SVN: r4970 - core/tags.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 06:20:54 -0400 (Mon, 26 Sep 2011)
New Revision: 4970
Added:
core/tags/2.4.1-GA/
Log:
[maven-scm] copy for tag 2.4.1-GA
12 years, 8 months
exo-jcr SVN: r4969 - in core/trunk: exo.core.component.database and 10 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 06:20:30 -0400 (Mon, 26 Sep 2011)
New Revision: 4969
Modified:
core/trunk/exo.core.component.database/pom.xml
core/trunk/exo.core.component.document/pom.xml
core/trunk/exo.core.component.ldap/pom.xml
core/trunk/exo.core.component.organization.api/pom.xml
core/trunk/exo.core.component.organization.jdbc/pom.xml
core/trunk/exo.core.component.organization.ldap/pom.xml
core/trunk/exo.core.component.script.groovy/pom.xml
core/trunk/exo.core.component.security.core/pom.xml
core/trunk/exo.core.component.web.css/pom.xml
core/trunk/exo.core.component.xml-processing/pom.xml
core/trunk/packaging/module/pom.xml
core/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.4.1-GA
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.database/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/trunk/exo.core.component.document/pom.xml
===================================================================
--- core/trunk/exo.core.component.document/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.document/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/trunk/exo.core.component.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.ldap/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.ldap/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/trunk/exo.core.component.organization.api/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.api/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.organization.api/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/trunk/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.ldap/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.organization.ldap/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/trunk/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/trunk/exo.core.component.script.groovy/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.script.groovy/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/trunk/exo.core.component.security.core/pom.xml
===================================================================
--- core/trunk/exo.core.component.security.core/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.security.core/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/trunk/exo.core.component.web.css/pom.xml
===================================================================
--- core/trunk/exo.core.component.web.css/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.web.css/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/trunk/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/trunk/exo.core.component.xml-processing/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/exo.core.component.xml-processing/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/trunk/packaging/module/pom.xml
===================================================================
--- core/trunk/packaging/module/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/packaging/module/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,13 +18,13 @@
<!-- declare the same dependencies than in the module.js -->
<dependencies>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.1-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.1-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.1-GA</version></dependency>
</dependencies>
<build>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
+++ core/trunk/pom.xml 2011-09-26 10:20:30 UTC (rev 4969)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.1-GA-SNAPSHOT</version>
+ <version>2.4.1-GA</version>
<packaging>pom</packaging>
<name>eXo Core</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.4.1-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.4.1-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.4.1-GA</url>
</scm>
<modules>
12 years, 8 months
exo-jcr SVN: r4968 - core/trunk.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 06:16:38 -0400 (Mon, 26 Sep 2011)
New Revision: 4968
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1513: change deps to tag
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-09-26 09:27:40 UTC (rev 4967)
+++ core/trunk/pom.xml 2011-09-26 10:16:38 UTC (rev 4968)
@@ -39,7 +39,7 @@
<exo.product.specification>2.4</exo.product.specification>
<org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
- <org.exoplatform.kernel.version>2.3.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3.1-GA</org.exoplatform.kernel.version>
</properties>
<scm>
12 years, 8 months
exo-jcr SVN: r4967 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/backup and 10 other directories.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2011-09-26 05:27:40 -0400 (Mon, 26 Sep 2011)
New Revision: 4967
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java
Log:
EXOJCR-1562 : add Session instance to PlainChangesLog.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -22,6 +22,8 @@
import java.util.List;
+import javax.jcr.Session;
+
/**
* Created by The eXo Platform SAS.<br/> Plain changes log implementation (i.e. no nested logs
* inside)
@@ -33,12 +35,12 @@
{
/**
- * Return Sesion Id.
+ * Return Session Id.
*
* @return sessionId of a session produced this changes log
*/
String getSessionId();
-
+
/**
* Return pair Id of system and non-system logs.
*
@@ -67,4 +69,11 @@
* @param states List of ItemState
*/
PlainChangesLog addAll(List<ItemState> states);
+
+ /**
+ * Return Session instance if any.
+ *
+ * @return Session instance if any.
+ */
+ Session getSession();
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -27,6 +27,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jcr.Session;
+
/**
* Created by The eXo Platform SAS.
*
@@ -37,7 +39,7 @@
public class PlainChangesLogImpl implements Externalizable, PlainChangesLog
{
private static final int NULL_VALUE = -1;
-
+
private static final int NOT_NULL_VALUE = 1;
private static final long serialVersionUID = 5624550860372364084L;
@@ -53,6 +55,8 @@
*/
protected String pairId = null;
+ protected Session session = null;
+
/**
* Full qualified constructor.
*
@@ -61,12 +65,13 @@
* @param eventType int
* @param pairId String
*/
- public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, String pairId)
+ public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, String pairId, Session session)
{
this.items = items;
this.sessionId = sessionId;
this.eventType = eventType;
this.pairId = pairId;
+ this.session = session;
}
/**
@@ -76,11 +81,21 @@
* @param sessionId String
* @param eventType int
*/
+ public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, Session session)
+ {
+ this(items, sessionId, eventType, null, session);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param items List of ItemState
+ * @param sessionId String
+ * @param eventType int
+ */
public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType)
{
- this.items = items;
- this.sessionId = sessionId;
- this.eventType = eventType;
+ this(items, sessionId, eventType, (Session)null);
}
/**
@@ -89,9 +104,9 @@
* @param items List of ItemState
* @param sessionId String
*/
- public PlainChangesLogImpl(List<ItemState> items, String sessionId)
+ public PlainChangesLogImpl(List<ItemState> items, String sessionId, Session session)
{
- this(items, sessionId, -1);
+ this(items, sessionId, -1, session);
}
/**
@@ -99,9 +114,19 @@
*
* @param sessionId String
*/
+ public PlainChangesLogImpl(String sessionId, Session session)
+ {
+ this(new ArrayList<ItemState>(), sessionId, session);
+ }
+
+ /**
+ * An empty log.
+ *
+ * @param sessionId String
+ */
public PlainChangesLogImpl(String sessionId)
{
- this(new ArrayList<ItemState>(), sessionId);
+ this(new ArrayList<ItemState>(), sessionId, (Session)null);
}
/**
@@ -109,7 +134,7 @@
*/
public PlainChangesLogImpl()
{
- this(new ArrayList<ItemState>(), null);
+ this(new ArrayList<ItemState>(), null, null);
}
/*
@@ -196,15 +221,25 @@
return pairId;
}
+ /**
+ * {@inheritDoc}
+ */
+ public Session getSession()
+ {
+ return session;
+ }
+
public String dump()
{
String str = "ChangesLog: \n";
for (int i = 0; i < items.size(); i++)
+ {
str +=
" " + ItemState.nameFromValue(items.get(i).getState()) + "\t" + items.get(i).getData().getIdentifier()
+ "\t" + "isPersisted=" + items.get(i).isPersisted() + "\t" + "isEventFire="
+ items.get(i).isEventFire() + "\t" + "isInternallyCreated=" + items.get(i).isInternallyCreated() + "\t"
+ items.get(i).getData().getQPath().getAsString() + "\n";
+ }
return str;
}
@@ -227,7 +262,7 @@
out.writeObject(items.get(i));
}
- if (pairId != null)
+ if (pairId != null)
{
out.writeInt(NOT_NULL_VALUE);
buff = pairId.getBytes(Constants.DEFAULT_ENCODING);
@@ -253,7 +288,7 @@
{
add((ItemState)in.readObject());
}
-
+
if (in.readInt() == NOT_NULL_VALUE)
{
buf = new byte[in.readInt()];
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -171,7 +171,9 @@
while (cli.hasNextLog())
{
if (cli.nextLog().getEventType() == ExtendedEvent.LOCK)
+ {
cli.removeLog();
+ }
}
saveChangesLog(changesLog);
@@ -194,22 +196,30 @@
TransactionChangesLog normalizeChangesLog =
getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog);
if (normalizeChangesLog != null)
+ {
saveChangesLog(normalizeChangesLog);
+ }
else
+ {
throw new RepositoryException(
"Collisions found during save of restore changes log, but caused item is not found by ID "
+ e.getIdentifier() + ". " + e, e);
+ }
}
catch (JCRItemExistsException e)
{
TransactionChangesLog normalizeChangesLog =
getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog);
if (normalizeChangesLog != null)
+ {
saveChangesLog(normalizeChangesLog);
+ }
else
+ {
throw new RepositoryException(
"Collisions found during save of restore changes log, but caused item is not found by ID "
+ e.getIdentifier() + ". " + e, e);
+ }
}
}
@@ -239,7 +249,9 @@
// Node... by ID and desc path
if (!item.getIdentifier().equals(collisionID)
&& !item.getQPath().isDescendantOf(citem.getData().getQPath()))
+ {
normalized.add(change);
+ }
}
else if (!item.getIdentifier().equals(collisionID))
{
@@ -248,11 +260,13 @@
}
}
else
+ {
// another state
normalized.add(change);
+ }
}
- PlainChangesLog plog = new PlainChangesLogImpl(normalized, next.getSessionId(), next.getEventType());
+ PlainChangesLog plog = new PlainChangesLogImpl(normalized, next.getSessionId(), next.getEventType(), next.getSession());
result.addLog(plog);
}
@@ -393,7 +407,9 @@
}
for (int i = 0; i < listFile.size(); i++)
+ {
fileCleaner.addFile(listFile.get(i));
+ }
}
}
@@ -427,9 +443,13 @@
{
boolean b = true;
if (fs.getItemSateId() != this.getItemSateId())
+ {
b = false;
+ }
if (fs.getValueDataId() != this.getValueDataId())
+ {
b = false;
+ }
return b;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -413,7 +413,7 @@
checkValid();
- PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId());
+ PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId(), session);
removeMergeFailed(version, changesLog);
@@ -497,7 +497,7 @@
// the new version identifier
String verIdentifier = IdGenerator.generate();
- SessionChangesLog changesLog = new SessionChangesLog(session.getId());
+ SessionChangesLog changesLog = new SessionChangesLog(session);
VersionHistoryImpl vh = versionHistory(false);
vh.addVersion(this.nodeData(), verIdentifier, changesLog);
@@ -550,7 +550,7 @@
return;
}
- SessionChangesLog changesLog = new SessionChangesLog(session.getId());
+ SessionChangesLog changesLog = new SessionChangesLog(session);
changesLog.add(ItemState.createUpdatedState(updatePropertyData(Constants.JCR_ISCHECKEDOUT,
new TransientValueData(true))));
@@ -711,7 +711,7 @@
+ session.getUserID() + " item owner " + getACL().getOwner());
}
- PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId());
+ PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId(), session);
VersionImpl base = (VersionImpl)getBaseVersion();
base.addPredecessor(version.getUUID(), changesLog);
@@ -1701,7 +1701,7 @@
Lock newLock = session.getLockManager().addLock(this, isDeep, isSessionScoped, -1);
PlainChangesLog changesLog =
- new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK);
+ new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK, session);
PropertyData propData =
TransientPropertyData.createPropertyData(nodeData(), Constants.JCR_LOCKOWNER, PropertyType.STRING, false,
@@ -1750,7 +1750,7 @@
Lock newLock = session.getLockManager().addLock(this, isDeep, false, timeOut);
PlainChangesLog changesLog =
- new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK);
+ new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK, session);
PropertyData propData =
TransientPropertyData.createPropertyData(nodeData(), Constants.JCR_LOCKOWNER, PropertyType.STRING, false,
@@ -2511,7 +2511,7 @@
throw new LockException("Node " + getPath() + " is locked ");
}
- SessionChangesLog changes = new SessionChangesLog(session.getId());
+ SessionChangesLog changes = new SessionChangesLog(session);
String srcPath;
try
@@ -2842,7 +2842,7 @@
{
PlainChangesLog changesLog =
- new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.UNLOCK);
+ new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.UNLOCK, session);
ItemData lockOwner =
dataManager.getItemData(nodeData(), new QPathEntry(Constants.JCR_LOCKOWNER, 0), ItemType.PROPERTY);
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -107,7 +107,7 @@
public SessionDataManager(SessionImpl session, LocalWorkspaceDataManagerStub dataManager) throws RepositoryException
{
this.session = session;
- this.changesLog = new SessionChangesLog(session.getId());
+ this.changesLog = new SessionChangesLog(session);
this.itemsPool = new ItemReferencePool();
this.itemFactory = new SessionItemFactory();
this.accessManager = session.getAccessManager();
@@ -2034,7 +2034,7 @@
// remove from changes log (Session pending changes)
PlainChangesLog slog = changesLog.pushLog(item.getQPath());
- SessionChangesLog changes = new SessionChangesLog(slog.getAllStates(), session.getId());
+ SessionChangesLog changes = new SessionChangesLog(slog.getAllStates(), session);
String exceptions = "";
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -127,7 +127,7 @@
{
session.checkLive();
- SessionChangesLog changes = new SessionChangesLog(session.getId());
+ SessionChangesLog changes = new SessionChangesLog(session);
clone(srcWorkspace, srcAbsPath, destAbsPath, removeExisting, changes);
@@ -214,7 +214,7 @@
srcNode.getData().accept(initializer);
- PlainChangesLogImpl changesLog = new PlainChangesLogImpl(initializer.getItemAddStates(), session.getId());
+ PlainChangesLogImpl changesLog = new PlainChangesLogImpl(initializer.getItemAddStates(), session.getId(), session);
session.getTransientNodesManager().getTransactManager().save(changesLog);
}
@@ -466,7 +466,7 @@
(NodeData)srcParentNode.getData(), nodeTypeManager, session.getTransientNodesManager(), true);
srcNode.getData().accept(initializer);
- PlainChangesLog changes = new PlainChangesLogImpl(session.getId());
+ PlainChangesLog changes = new PlainChangesLogImpl(session.getId(), session);
changes.addAll(initializer.getAllStates());
// reload items pool
@@ -590,7 +590,7 @@
List<VersionImpl> notExistedVersions = new ArrayList<VersionImpl>();
TransactionableDataManager dataManager = session.getTransientNodesManager().getTransactManager();
- SessionChangesLog changesLog = new SessionChangesLog(session.getId());
+ SessionChangesLog changesLog = new SessionChangesLog(session);
for (Version v : versions)
{
String versionableIdentifier = v.getContainingHistory().getVersionableUUID();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -93,8 +93,14 @@
String sessionId = subLog.getSessionId();
SessionImpl userSession = sessionRegistry.getSession(sessionId);
+ // try to get session from changesLog
+ if (userSession == null)
+ {
+ userSession = (SessionImpl)subLog.getSession();
+ }
if (userSession != null)
+ {
for (ItemState itemState : subLog.getAllStates())
{
if (itemState.isEventFire())
@@ -123,6 +129,7 @@
}
}
}
+ }
}
if (events.getSize() > 0)
{
@@ -142,14 +149,18 @@
private boolean isSessionMatch(ListenerCriteria criteria, String sessionId)
{
if (criteria.getNoLocal() && criteria.getSessionId().equals(sessionId))
+ {
return false;
+ }
return true;
}
private boolean isPathMatch(ListenerCriteria criteria, ItemData item, SessionImpl userSession)
{
if (criteria.getAbsPath() == null)
+ {
return true;
+ }
try
{
QPath cLoc = userSession.getLocationFactory().parseAbsPath(criteria.getAbsPath()).getInternalPath();
@@ -171,15 +182,21 @@
{
if (criteria.getIdentifier() == null)
+ {
return true;
+ }
// assotiated parent is node itself for node and parent for property ????
for (int i = 0; i < criteria.getIdentifier().length; i++)
{
if (item.isNode() && criteria.getIdentifier()[i].equals(item.getIdentifier()))
+ {
return true;
+ }
else if (!item.isNode() && criteria.getIdentifier()[i].equals(item.getParentIdentifier()))
+ {
return true;
+ }
}
return false;
@@ -189,7 +206,9 @@
PlainChangesLog changesLog) throws RepositoryException
{
if (criteria.getNodeTypeName() == null)
+ {
return true;
+ }
NodeData node = (NodeData)workspaceDataManager.getItemData(item.getParentIdentifier());
if (node == null)
@@ -231,7 +250,9 @@
testQNames[0] = node.getPrimaryTypeName();
}
if (ntManager.isNodeType(criteriaNT.getName(), testQNames))
+ {
return true;
+ }
}
return false;
}
@@ -242,24 +263,40 @@
if (state.getData().isNode())
{
if (state.isAdded() || state.isRenamed() || state.isUpdated())
+ {
return Event.NODE_ADDED;
+ }
else if (state.isDeleted())
+ {
return Event.NODE_REMOVED;
+ }
else if (state.isUpdated())
+ {
return SKIP_EVENT;
+ }
else if (state.isUnchanged())
+ {
return SKIP_EVENT;
+ }
}
else
{ // property
if (state.isAdded())
+ {
return Event.PROPERTY_ADDED;
+ }
else if (state.isDeleted())
+ {
return Event.PROPERTY_REMOVED;
+ }
else if (state.isUpdated())
+ {
return Event.PROPERTY_CHANGED;
+ }
else if (state.isUnchanged())
+ {
return SKIP_EVENT;
+ }
}
throw new RepositoryException("Unexpected ItemState for Node " + ItemState.nameFromValue(state.getState()) + " "
+ state.getData().getQPath().getAsString());
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -174,7 +174,7 @@
this.bestEffort = bestEffort;
this.failed = failed;
- this.changes = new SessionChangesLog(mergeSession.getId());
+ this.changes = new SessionChangesLog(mergeSession);
}
@Override
@@ -530,6 +530,7 @@
ItemType.PROPERTY);
if (predecessorsProperty != null)
+ {
for (ValueData pv : predecessorsProperty.getValues())
{
try
@@ -537,7 +538,9 @@
String pidentifier = new String(pv.getAsByteArray());
if (pidentifier.equals(corrVersion.getIdentifier()))
+ {
return true; // got it
+ }
// search in predecessors of the predecessor
NodeData predecessor = (NodeData)mergeDataManager.getItemData(pidentifier);
@@ -560,6 +563,7 @@
}
}
// else it's a root version
+ }
return false;
}
@@ -576,6 +580,7 @@
ItemType.PROPERTY);
if (successorsProperty != null)
+ {
for (ValueData sv : successorsProperty.getValues())
{
try
@@ -583,7 +588,9 @@
String sidentifier = new String(sv.getAsByteArray());
if (sidentifier.equals(corrVersion.getIdentifier()))
+ {
return true; // got it
+ }
// search in successors of the successor
NodeData successor = (NodeData)mergeDataManager.getItemData(sidentifier);
@@ -606,6 +613,7 @@
}
}
// else it's a end of version graph node
+ }
return false;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -204,8 +204,8 @@
parent.getPrimaryTypeName(), parent.getMixinTypeNames()).getOnParentVersion();
if (onParentVersion == OnParentVersionAction.VERSION
- && nodeTypeDataManager.isNodeType(Constants.MIX_VERSIONABLE, node.getPrimaryTypeName(),
- node.getMixinTypeNames()))
+ && nodeTypeDataManager.isNodeType(Constants.MIX_VERSIONABLE, node.getPrimaryTypeName(), node
+ .getMixinTypeNames()))
{
remainedNode = node.getQPath();
@@ -240,8 +240,8 @@
}
ItemState state =
- new ItemState(node, ItemState.DELETED, true, ancestorToSave != null ? ancestorToSave
- : removedRoot.getQPath());
+ new ItemState(node, ItemState.DELETED, true, ancestorToSave != null ? ancestorToSave : removedRoot
+ .getQPath());
itemRemovedStates.add(state);
}
@@ -282,7 +282,7 @@
super(userSession.getTransientNodesManager().getTransactManager());
this.userSession = userSession;
- this.changes = new SessionChangesLog(userSession.getId());
+ this.changes = new SessionChangesLog(userSession);
this.context = context;
this.destName = destName;
this.history = history;
@@ -309,7 +309,9 @@
for (ItemState state : delegatedChanges.getAllStates())
{
if (state.getData().getIdentifier().equals(identifier))
+ {
return state.getData();
+ }
}
}
@@ -323,7 +325,9 @@
for (ItemState state : delegatedChanges.getAllStates())
{
if (state.getData().getQPath().equals(path))
+ {
return state.getData();
+ }
}
}
@@ -338,7 +342,9 @@
for (ItemState state : delegatedChanges.getAllStates())
{
if (state.getData().getQPath().equals(path) || state.getData().getQPath().isDescendantOf(path))
+ {
removed.add(state);
+ }
}
for (ItemState state : removed)
@@ -355,7 +361,9 @@
QPath nodePath = QPath.makeChildPath(parentData.getQPath(), name);
if (log.isDebugEnabled())
+ {
log.debug("Restore: " + nodePath.getAsString() + ", removeExisting=" + removeExisting);
+ }
PropertyData frozenIdentifier =
(PropertyData)dataManager.getItemData(frozen, new QPathEntry(Constants.JCR_FROZENUUID, 1), ItemType.PROPERTY);
@@ -383,11 +391,13 @@
// parent
sameIdentifierPath.getName().equals(nodePath.getName()))
{ // same
- // name
+ // name
if (sameIdentifierPath.getIndex() != nodePath.getIndex())
+ {
// but different index, see below... fix it
nodePath = QPath.makeChildPath(parentData.getQPath(), name, sameIdentifierPath.getIndex());
+ }
// if it's a target node
existing = sameIdentifierNode;
@@ -606,7 +616,9 @@
NodeData cHistory = null;
if ((cHistory = (NodeData)dataManager.getItemData(vhIdentifier)) == null)
+ {
throw new RepositoryException("Version history is not found with uuid " + vhIdentifier);
+ }
childHistory = new VersionHistoryDataHelper(cHistory, dataManager, nodeTypeDataManager);
}
@@ -677,8 +689,7 @@
int action =
nodeTypeDataManager.getChildNodeDefinition(qname, frozen.getPrimaryTypeName(),
- currentNode().getPrimaryTypeName(),
- currentNode().getMixinTypeNames()).getOnParentVersion();
+ currentNode().getPrimaryTypeName(), currentNode().getMixinTypeNames()).getOnParentVersion();
if (log.isDebugEnabled())
{
@@ -695,8 +706,8 @@
// jcr:uuid
String jcrUuid = null;
NodeData existing = null;
- if (nodeTypeDataManager.isNodeType(Constants.MIX_REFERENCEABLE, frozen.getPrimaryTypeName(),
- frozen.getMixinTypeNames()))
+ if (nodeTypeDataManager.isNodeType(Constants.MIX_REFERENCEABLE, frozen.getPrimaryTypeName(), frozen
+ .getMixinTypeNames()))
{
// copy uuid from frozen state of mix:referenceable,
// NOTE: mix:referenceable stored in frozen state with genereted ID
@@ -772,12 +783,12 @@
AccessControlList acl = currentNode().getACL();
boolean isPrivilegeable =
- nodeTypeDataManager.isNodeType(Constants.EXO_PRIVILEGEABLE, frozen.getPrimaryTypeName(),
- frozen.getMixinTypeNames());
+ nodeTypeDataManager.isNodeType(Constants.EXO_PRIVILEGEABLE, frozen.getPrimaryTypeName(), frozen
+ .getMixinTypeNames());
boolean isOwneable =
- nodeTypeDataManager.isNodeType(Constants.EXO_OWNEABLE, frozen.getPrimaryTypeName(),
- frozen.getMixinTypeNames());
+ nodeTypeDataManager.isNodeType(Constants.EXO_OWNEABLE, frozen.getPrimaryTypeName(), frozen
+ .getMixinTypeNames());
if (isPrivilegeable || isOwneable)
{
@@ -816,8 +827,8 @@
{
// copy existed - i.e. left unchanged
ItemDataCopyVisitor copyVisitor =
- new ItemDataCopyVisitor(currentNode(), frozen.getQPath().getName(), nodeTypeDataManager,
- userSession.getTransientNodesManager(), userSession.getTransientNodesManager(), true);
+ new ItemDataCopyVisitor(currentNode(), frozen.getQPath().getName(), nodeTypeDataManager, userSession
+ .getTransientNodesManager(), userSession.getTransientNodesManager(), true);
existed.accept(copyVisitor);
changes.addAll(copyVisitor.getItemAddStates());
} // else - nothing to do, i.e. left unchanged
@@ -839,6 +850,7 @@
InternalQName qname = property.getQPath().getName();
if (nodeTypeDataManager.isNodeType(Constants.NT_FROZENNODE, frozenParent.getPrimaryTypeName()))
+ {
if (qname.equals(Constants.JCR_FROZENPRIMARYTYPE))
{
qname = Constants.JCR_PRIMARYTYPE;
@@ -857,11 +869,11 @@
// skip these props, as they are a nt:frozenNode special props
return;
}
+ }
int action =
- nodeTypeDataManager
- .getPropertyDefinitions(qname, currentNode().getPrimaryTypeName(), currentNode().getMixinTypeNames())
- .getAnyDefinition().getOnParentVersion();
+ nodeTypeDataManager.getPropertyDefinitions(qname, currentNode().getPrimaryTypeName(),
+ currentNode().getMixinTypeNames()).getAnyDefinition().getOnParentVersion();
if (log.isDebugEnabled())
{
@@ -878,14 +890,14 @@
if (qname.equals(Constants.JCR_PREDECESSORS))
{
tagetProperty =
- TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(),
- property.isMultiValued(), new ArrayList<ValueData>());
+ TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(), property
+ .isMultiValued(), new ArrayList<ValueData>());
}
else
{
tagetProperty =
- TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(),
- property.isMultiValued(), copyValues(property));
+ TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(), property
+ .isMultiValued(), copyValues(property));
}
changes.add(ItemState.createAddedState(tagetProperty));
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -347,7 +347,7 @@
+ refs.get(0).getQPath().getAsString());
}
- PlainChangesLog changes = new PlainChangesLogImpl(session.getId());
+ PlainChangesLog changes = new PlainChangesLogImpl(session.getId(), session);
// remove labels first
try
@@ -527,7 +527,7 @@
NodeData versionData = getVersionData(versionName);
- SessionChangesLog changesLog = new SessionChangesLog(session.getId());
+ SessionChangesLog changesLog = new SessionChangesLog(session);
PropertyData labelData =
TransientPropertyData.createPropertyData(labels, labelQName, PropertyType.REFERENCE, false,
@@ -553,7 +553,7 @@
if (vldata != null)
{
- PlainChangesLog changes = new PlainChangesLogImpl(session.getId());
+ PlainChangesLog changes = new PlainChangesLogImpl(session.getId(), session);
changes.add(ItemState.createDeletedState(vldata));
dataManager.getTransactManager().save(changes);
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -145,8 +145,8 @@
* {@inheritDoc}
*/
@Override
- public List<PropertyData> getChildPropertiesData(final NodeData nodeData, final List<QPathEntryFilter> itemDataFilters)
- throws RepositoryException
+ public List<PropertyData> getChildPropertiesData(final NodeData nodeData,
+ final List<QPathEntryFilter> itemDataFilters) throws RepositoryException
{
if (isSystemDescendant(nodeData.getQPath()) && !this.equals(versionDataManager))
{
@@ -286,18 +286,20 @@
final String pairId = IdGenerator.generate();
versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType(),
- pairId));
+ pairId, changes.getSession()));
nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType(),
- pairId));
+ pairId, changes.getSession()));
}
else
{
- versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType()));
+ versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType(),
+ changes.getSession()));
}
}
else if (nvstates.size() > 0)
{
- nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType()));
+ nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType(),
+ changes.getSession()));
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -420,7 +420,7 @@
// copy state
PlainChangesLogImpl newLog =
new PlainChangesLogImpl(new ArrayList<ItemState>(), changesLog.getSessionId(), changesLog.getEventType(),
- changesLog.getPairId());
+ changesLog.getPairId(), changesLog.getSession());
for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();)
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -95,7 +95,8 @@
.getAncestorToSave(), change.isInternallyCreated(), change.isPersisted(), change.getOldPath()));
}
- newLog.addLog(new PlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType()));
+ newLog.addLog(new PlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType(), changes
+ .getSession()));
}
storageDataManager.save(newLog);
@@ -145,7 +146,8 @@
/**
* {@inheritDoc}
*/
- public List<NodeData> getChildNodesData(NodeData parent, List<QPathEntryFilter> patternFilters) throws RepositoryException
+ public List<NodeData> getChildNodesData(NodeData parent, List<QPathEntryFilter> patternFilters)
+ throws RepositoryException
{
return copyNodes(storageDataManager.getChildNodesData(parent, patternFilters));
}
@@ -166,7 +168,7 @@
{
return storageDataManager.getLastOrderNumber(parent);
}
-
+
/**
* {@inheritDoc}
*/
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -28,6 +28,7 @@
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.jcr.impl.core.SessionImpl;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,6 +36,8 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Session;
+
/**
* Created by The eXo Platform SAS.<br/> Responsible for managing session changes log. Relying on
* fact that ItemData inside ItemState SHOULD be TransientItemData
@@ -84,9 +87,19 @@
*
* @param sessionId
*/
+ public SessionChangesLog(Session session)
+ {
+ super(((SessionImpl)session).getId(), session);
+ }
+
+ /**
+ * Create empty ChangesLog.
+ *
+ * @param sessionId
+ */
public SessionChangesLog(String sessionId)
{
- super(sessionId);
+ super(sessionId, null);
}
/**
@@ -95,14 +108,14 @@
* @param items
* @param sessionId
*/
- public SessionChangesLog(List<ItemState> items, String sessionId)
+ public SessionChangesLog(List<ItemState> items, Session session)
{
- super(items, sessionId);
+ super(items, ((SessionImpl)session).getId(), session);
for (int i = 0, length = items.size(); i < length; i++)
{
ItemState change = items.get(i);
addItem(change);
- }
+ }
}
/**
@@ -176,9 +189,13 @@
if (childInfo != null)
{
if (item.isDeleted())
+ {
++childInfo[CHILD_NODES_COUNT_INDEX];
+ }
else if (item.isAdded())
+ {
--childInfo[CHILD_NODES_COUNT_INDEX];
+ }
childNodesInfo.put(item.getData().getParentIdentifier(), childInfo);
}
@@ -188,13 +205,17 @@
{
Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier());
if (children != null)
+ {
children.remove(item.getData().getIdentifier());
+ }
}
else
{
Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier());
if (children != null)
+ {
children.remove(item.getData().getIdentifier());
+ }
}
}
}
@@ -321,7 +342,7 @@
*/
public PlainChangesLog pushLog(QPath rootPath)
{
- PlainChangesLog cLog = new PlainChangesLogImpl(sessionId);
+ PlainChangesLog cLog = new PlainChangesLogImpl(sessionId, session);
if (rootPath.equals(Constants.ROOT_PATH))
{
@@ -419,7 +440,9 @@
{
ItemData item = items.get(i).getData();
if (item.getParentIdentifier().equals(rootIdentifier) || item.getIdentifier().equals(rootIdentifier))
+ {
list.add(items.get(i));
+ }
}
return list;
}
@@ -475,11 +498,15 @@
{
// the node
if (items.get(i).isAdded())
+ {
// if a new item - no modify changes can be
return new ArrayList<ItemState>();
+ }
if (!items.get(i).isDeleted())
+ {
changes.put(item.getIdentifier(), items.get(i));
+ }
}
else if (item.getParentIdentifier().equals(rootData.getIdentifier()))
{
@@ -536,7 +563,9 @@
rename = state;
delete = allStates.get(i - 1); // try the fresh delete state
if (delete.getData().getIdentifier().equals(rename.getData().getIdentifier()))
+ {
return new ItemState[]{delete, rename}; // 3. ok, got it
+ }
}
}
@@ -592,7 +621,9 @@
}
}
else
+ {
byState = true;
+ }
if (byState
&& (isPersisted != null ? istate.isPersisted() == isPersisted : true)
&& ((orAncestor != null && orAncestor ? rootPath.isDescendantOf(istate.getData().getQPath()) : true) || rootPath
@@ -639,7 +670,9 @@
}
}
else
+ {
byState = true;
+ }
if (byState && (isPersisted != null ? istate.isPersisted() == isPersisted : true)
&& istate.getData().getIdentifier().equals(id))
{
@@ -687,7 +720,9 @@
{
int[] childInfo = childNodesInfo.get(item.getData().getParentIdentifier());
if (childInfo == null)
+ {
childInfo = new int[2];
+ }
if (item.isDeleted())
{
@@ -753,22 +788,34 @@
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
IDStateBasedKey other = (IDStateBasedKey)obj;
if (identifier == null)
{
if (other.identifier != null)
+ {
return false;
+ }
}
else if (!identifier.equals(other.identifier))
+ {
return false;
+ }
if (state != other.state)
+ {
return false;
+ }
return true;
}
}
@@ -842,37 +889,55 @@
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
ParentIDQPathBasedKey other = (ParentIDQPathBasedKey)obj;
if (name == null)
{
if (other.name != null)
+ {
return false;
+ }
}
else if (!name.getName().equals(other.name.getName())
|| !name.getNamespace().equals(other.name.getNamespace()) || name.getIndex() != other.name.getIndex())
+ {
return false;
+ }
if (parentIdentifier == null)
{
if (other.parentIdentifier != null)
+ {
return false;
+ }
}
else if (!parentIdentifier.equals(other.parentIdentifier))
+ {
return false;
+ }
if (itemType == null)
{
if (other.itemType != null)
+ {
return false;
+ }
}
else if (!itemType.equals(other.itemType))
+ {
return false;
+ }
return true;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -129,6 +129,7 @@
this.currentWorkspaceName = currentWorkspaceName;
this.tree = new Stack<NodeData>();
this.tree.push(parent);
+ // no session instance required
this.changesLog = new PlainChangesLogImpl(SESSION_ID);
this.ancestorToSave = ancestorToSave;
this.isNeedReloadAncestorToSave = false;
@@ -157,6 +158,7 @@
{
String str = "";
for (int i = 0; i < changesLog.getAllStates().size(); i++)
+ {
str +=
" " + ItemState.nameFromValue(changesLog.getAllStates().get(i).getState()) + "\t\t"
+ changesLog.getAllStates().get(i).getData().getIdentifier() + "\t" + "isPersisted="
@@ -164,6 +166,7 @@
+ changesLog.getAllStates().get(i).isEventFire() + "\t" + "isInternallyCreated="
+ changesLog.getAllStates().get(i).isInternallyCreated() + "\t"
+ changesLog.getAllStates().get(i).getData().getQPath().getAsString() + "\n";
+ }
log.debug(str);
}
if (isNeedReloadAncestorToSave)
@@ -196,7 +199,9 @@
{
int cur = ((NodeData)stateData).getOrderNumber();
if (cur > max)
+ {
max = cur;
+ }
}
}
return ++max;
@@ -401,7 +406,9 @@
currentNodeInfo.setIsNewIdentifer(true);
}
if (uuidBehavior == ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING)
+ {
currentNodeInfo.setParentIdentifer(getParent().getIdentifier());
+ }
}
@@ -439,7 +446,9 @@
{
((ImportItemData)data).setParentIdentifer(identifier);
if (reloadSNS)
+ {
((ImportItemData)data).setQPath(QPath.makeChildPath(newPath, data.getQPath().getName()));
+ }
}
@@ -565,7 +574,9 @@
{
ItemState state = allStates.get(i);
if (state.getData().getIdentifier().equals(identifer))
+ {
return state;
+ }
}
return null;
}
@@ -582,9 +593,13 @@
String id1 = data.getParentIdentifier();
String id2 = parent.getIdentifier();
if (id1 == id2)
+ {
return true;
+ }
if (id1 == null && id2 != null)
+ {
return false;
+ }
return id1.equals(id2);
}
@@ -684,9 +699,13 @@
if (i1.getState() != i2.getState())
{
if (i2.isDeleted())
+ {
sign = 1;
+ }
else
+ {
sign = -1;
+ }
}
return sign;
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -23,6 +23,7 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.observation.Event;
public class TestSessionsObservation extends JcrAPIBaseTest
@@ -261,4 +262,26 @@
sessionWs1.getWorkspace().getObservationManager().removeEventListener(listener2);
}
}
+
+ public void testMoveOnClosedSession() throws Exception
+ {
+
+ testRootWs1.addNode("newNode");
+ sessionWs1.save();
+
+ int counter = 0;
+
+ SimpleListener listener = new SimpleListener("testSessionOpen", log, counter);
+
+ Session sessionWs1ForListener = repository.login(credentials, "ws1");
+
+ sessionWs1ForListener.getWorkspace().getObservationManager().addEventListener(listener,
+ Event.NODE_ADDED | Event.NODE_REMOVED, testRootWs1.getPath() + "/", false, null, null, false);
+
+ sessionWs1ForListener.logout();
+
+ sessionWs1.logout();
+ sessionWs1.getWorkspace().move(testRootWs1.getPath() + "/newNode", testRootWs1.getPath() + "/newNode2");
+ assertEquals(2, listener.getCounter());
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -120,7 +120,9 @@
try
{
userSession = (SessionImpl)frepository.login(fcredentials, "ws");
- chlog[0] = new SessionChangesLogInfo(new SessionChangesLog(userSession.getId()), userSession.getId());
+ chlog[0] =
+ new SessionChangesLogInfo(new SessionChangesLog(userSession), userSession
+ .getId());
}
catch (RepositoryException e)
{
@@ -148,7 +150,7 @@
public void testSameSession()
{
- SessionChangesLog chlog = new SessionChangesLog(session.getId());
+ SessionChangesLog chlog = new SessionChangesLog(session);
assertEquals("Session must be same as given id owns", session, getRegisteredSession(chlog.getSessionId()));
}
@@ -248,7 +250,7 @@
public void testAddRootChanges() throws Exception
{
- SessionChangesLog changesLog = new SessionChangesLog(session.getId());
+ SessionChangesLog changesLog = new SessionChangesLog(session);
try
{
changesLog.add(new ItemState(new TransientPropertyData(Constants.ROOT_PATH, Constants.ROOT_UUID, 0,
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -147,7 +147,9 @@
path = resource.setProperty("jcr:data", vals).getPath();
}
else
+ {
path = resource.setProperty("jcr:data", fBLOB1).getPath();
+ }
resource.setProperty("jcr:mimeType", "application/x-octet-stream");
resource.setProperty("jcr:lastModified", Calendar.getInstance());
testRoot.save();
@@ -191,7 +193,7 @@
{
try
{
- SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession().getId());
+ SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession());
TransientNodeData ntfile =
TransientNodeData.createNodeData(rootData, InternalQName.parse("[]blob" + i), Constants.NT_FILE);
@@ -218,7 +220,9 @@
data.add(new TransientValueData(fBLOB2));
}
else
+ {
data.add(new TransientValueData(fBLOB1));
+ }
TransientPropertyData resData =
TransientPropertyData.createPropertyData(res, Constants.JCR_DATA, PropertyType.BINARY, data.size() > 1,
@@ -259,7 +263,7 @@
{
final DataManager dm =
((NodeImpl)testRoot).getSession().getTransientNodesManager().getTransactManager().getStorageDataManager();
- final SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession().getId());
+ final SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession());
class Remover
{
@@ -301,12 +305,18 @@
}
if (item == null)
+ {
break;
+ }
if (item.isNode())
+ {
parent = (NodeData)item;
+ }
else if (i < relPathEntries.length - 1)
+ {
throw new IllegalPathException("Path can not contains a property as the intermediate element");
+ }
}
return item;
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java 2011-09-26 09:15:36 UTC (rev 4966)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java 2011-09-26 09:27:40 UTC (rev 4967)
@@ -223,7 +223,7 @@
versionedVersionHistoryData = new ArrayList<ValueData>();
versionedVersionHistoryData.add(new TestTransientValueData(versionedVersionHistoryUuid.getBytes(), 0));
- changesLog = new SessionChangesLog(session.getId());
+ changesLog = new SessionChangesLog(session);
ntManager = (NodeTypeManagerImpl)session.getWorkspace().getNodeTypeManager();
@@ -267,7 +267,7 @@
public void createVersionable(int testCase) throws Exception
{
- versionableLog = new SessionChangesLog(session.getId());
+ versionableLog = new SessionChangesLog(session);
// target node
versionable =
12 years, 8 months
exo-jcr SVN: r4966 - in kernel/trunk: exo.kernel.commons and 13 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 05:15:36 -0400 (Mon, 26 Sep 2011)
New Revision: 4966
Modified:
kernel/trunk/exo.kernel.commons.test/pom.xml
kernel/trunk/exo.kernel.commons/pom.xml
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.command/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/trunk/exo.kernel.mc-integration/pom.xml
kernel/trunk/packaging/module/pom.xml
kernel/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: kernel/trunk/exo.kernel.commons/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.commons/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/trunk/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/trunk/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.command/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.container/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/trunk/packaging/module/pom.xml
===================================================================
--- kernel/trunk/packaging/module/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/packaging/module/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-09-26 09:15:01 UTC (rev 4965)
+++ kernel/trunk/pom.xml 2011-09-26 09:15:36 UTC (rev 4966)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-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.3.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.1-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url>
</scm>
<modules>
12 years, 8 months
exo-jcr SVN: r4965 - kernel/tags.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 05:15:01 -0400 (Mon, 26 Sep 2011)
New Revision: 4965
Added:
kernel/tags/2.3.1-GA/
Log:
[maven-scm] copy for tag 2.3.1-GA
12 years, 8 months
exo-jcr SVN: r4964 - in kernel/trunk: exo.kernel.commons and 13 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-26 05:14:28 -0400 (Mon, 26 Sep 2011)
New Revision: 4964
Modified:
kernel/trunk/exo.kernel.commons.test/pom.xml
kernel/trunk/exo.kernel.commons/pom.xml
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.command/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/trunk/exo.kernel.mc-integration/pom.xml
kernel/trunk/packaging/module/pom.xml
kernel/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.1-GA
Modified: kernel/trunk/exo.kernel.commons/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.commons/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/trunk/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/trunk/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.command/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.container/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/trunk/packaging/module/pom.xml
===================================================================
--- kernel/trunk/packaging/module/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/packaging/module/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
+++ kernel/trunk/pom.xml 2011-09-26 09:14:28 UTC (rev 4964)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.3.1-GA</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/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.3.1-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.1-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.1-GA</url>
</scm>
<modules>
12 years, 8 months
exo-jcr SVN: r4963 - jcr/branches/1.12.x.
by do-not-reply@jboss.org
Author: quangexoplatform
Date: 2011-09-23 06:53:17 -0400 (Fri, 23 Sep 2011)
New Revision: 4963
Modified:
jcr/branches/1.12.x/pom.xml
Log:
[PLF-1998] Upgrade dependencies to next snapshots
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
+++ jcr/branches/1.12.x/pom.xml 2011-09-23 10:53:17 UTC (rev 4963)
@@ -42,9 +42,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.10-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.10-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.10-GA</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.2.11-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.11-GA-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.11-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
</properties>
12 years, 8 months
exo-jcr SVN: r4962 - in jcr/branches/1.12.x: applications and 24 other directories.
by do-not-reply@jboss.org
Author: quangexoplatform
Date: 2011-09-23 05:57:03 -0400 (Fri, 23 Sep 2011)
New Revision: 4962
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.12.x/applications/pom.xml
jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.12.x/packaging/module/pom.xml
jcr/branches/1.12.x/pom.xml
Log:
[maven-release-plugin] [PLF-1998]prepare for next development iteration
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</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.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.12.x/applications/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/applications/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.12.x/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.12.x/packaging/module/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/packaging/module/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2011-09-23 09:56:16 UTC (rev 4961)
+++ jcr/branches/1.12.x/pom.xml 2011-09-23 09:57:03 UTC (rev 4962)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.10-GA</version>
+ <version>1.12.11-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.10-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.10-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.12.10-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.12.x</url>
</scm>
<properties>
12 years, 8 months