exo-jcr SVN: r2456 - in core/branches/2.3-SEC: exo.core.component.database and 10 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-03 04:22:14 -0400 (Thu, 03 Jun 2010)
New Revision: 2456
Modified:
core/branches/2.3-SEC/exo.core.component.database/pom.xml
core/branches/2.3-SEC/exo.core.component.document/pom.xml
core/branches/2.3-SEC/exo.core.component.ldap/pom.xml
core/branches/2.3-SEC/exo.core.component.organization.api/pom.xml
core/branches/2.3-SEC/exo.core.component.organization.jdbc/pom.xml
core/branches/2.3-SEC/exo.core.component.organization.ldap/pom.xml
core/branches/2.3-SEC/exo.core.component.script.groovy/pom.xml
core/branches/2.3-SEC/exo.core.component.security.core/pom.xml
core/branches/2.3-SEC/exo.core.component.web.css/pom.xml
core/branches/2.3-SEC/exo.core.component.xml-processing/pom.xml
core/branches/2.3-SEC/packaging/module/pom.xml
core/branches/2.3-SEC/pom.xml
Log:
EXOJCR-764 branch version updated
Modified: core/branches/2.3-SEC/exo.core.component.database/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.database/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.database/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.document/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.document/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.document/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/branches/2.3-SEC/exo.core.component.ldap/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.ldap/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.ldap/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.organization.api/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.organization.api/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.organization.api/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/branches/2.3-SEC/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.organization.jdbc/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.organization.jdbc/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.organization.ldap/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.organization.ldap/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.script.groovy/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.script.groovy/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.security.core/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.security.core/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.security.core/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.web.css/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.web.css/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.web.css/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/branches/2.3-SEC/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/branches/2.3-SEC/exo.core.component.xml-processing/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/exo.core.component.xml-processing/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/branches/2.3-SEC/packaging/module/pom.xml
===================================================================
--- core/branches/2.3-SEC/packaging/module/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/packaging/module/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-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.3.2-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.2-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.2-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.2-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.2-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.2-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.2-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3-SEC-SNAPSHOT</version></dependency>
</dependencies>
<build>
Modified: core/branches/2.3-SEC/pom.xml
===================================================================
--- core/branches/2.3-SEC/pom.xml 2010-06-03 08:14:25 UTC (rev 2455)
+++ core/branches/2.3-SEC/pom.xml 2010-06-03 08:22:14 UTC (rev 2456)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.2-GA-SNAPSHOT</version>
+ <version>2.3-SEC-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Core</name>
13 years, 12 months
exo-jcr SVN: r2455 - in jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr: datamodel and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-06-03 04:14:25 -0400 (Thu, 03 Jun 2010)
New Revision: 2455
Added:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/datamodel/
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/datamodel/TestQPath.java
Log:
EXOJCR-766: TestQPath.java added
Added: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/datamodel/TestQPath.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/datamodel/TestQPath.java (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/datamodel/TestQPath.java 2010-06-03 08:14:25 UTC (rev 2455)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.services.jcr.datamodel;
+
+import junit.framework.TestCase;
+
+/**
+ * Created by The eXo Platform SAS.
+ *
+ * <br/>Date:
+ *
+ * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a>
+ * @version $Id: TestQPath.java 111 2008-11-11 11:11:11Z serg $
+ */
+public class TestQPath extends TestCase
+{
+
+ public void testDescendantOrSelfOnSiblings() throws Exception
+ {
+ // make path
+ QPath path1 = QPath.parse("[]:1[]testRoot:1[]node1:4");
+ QPath path2 = QPath.parse("[]:1[]testRoot:1[]node1:3");
+ QPath child1 = QPath.parse("[]:1[]testRoot:1[]node1:4[]child1:5");
+
+ assertTrue(child1.isDescendantOf(path1));
+
+ assertFalse(child1.isDescendantOf(path2));
+ }
+
+}
13 years, 12 months
exo-jcr SVN: r2454 - core/branches.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-03 04:11:16 -0400 (Thu, 03 Jun 2010)
New Revision: 2454
Added:
core/branches/2.3-SEC/
Log:
EXOJCR-764 - 2.3-SEC branch added for research
Copied: core/branches/2.3-SEC (from rev 2453, core/trunk)
13 years, 12 months
exo-jcr SVN: r2453 - in jcr/branches/1.12-SEC: applications and 25 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-02 11:19:13 -0400 (Wed, 02 Jun 2010)
New Revision: 2453
Modified:
jcr/branches/1.12-SEC/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.12-SEC/applications/exo.jcr.ear/pom.xml
jcr/branches/1.12-SEC/applications/pom.xml
jcr/branches/1.12-SEC/docs/pom.xml
jcr/branches/1.12-SEC/docs/reference/en/pom.xml
jcr/branches/1.12-SEC/docs/reference/pom.xml
jcr/branches/1.12-SEC/docs/userguide/en/pom.xml
jcr/branches/1.12-SEC/docs/userguide/pom.xml
jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml
jcr/branches/1.12-SEC/exo.jcr.component.ext/pom.xml
jcr/branches/1.12-SEC/exo.jcr.component.ftp/pom.xml
jcr/branches/1.12-SEC/exo.jcr.component.statistics/pom.xml
jcr/branches/1.12-SEC/exo.jcr.component.webdav/pom.xml
jcr/branches/1.12-SEC/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.12-SEC/exo.jcr.framework.command/pom.xml
jcr/branches/1.12-SEC/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.12-SEC/exo.jcr.framework.web/pom.xml
jcr/branches/1.12-SEC/packaging/module/pom.xml
jcr/branches/1.12-SEC/pom.xml
Log:
EXOJCR-764 branch version updated
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.backupconsole/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.backupconsole/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.browser/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.browser/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.config/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.config/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.fckeditor/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.fckeditor/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.jboss/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.jboss/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-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.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.jonas/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.jonas/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-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.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.rest/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.rest/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.applications.tomcat/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.applications.tomcat/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.cluster.testclient/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.cluster.testclient/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.12-SEC/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/exo.jcr.ear/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/exo.jcr.ear/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.12-SEC/applications/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/applications/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/applications/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.12-SEC/docs/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/docs/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/docs/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12-SEC/docs/reference/en/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/docs/reference/en/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/docs/reference/en/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>reference-docs</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12-SEC/docs/reference/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/docs/reference/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/docs/reference/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12-SEC/docs/userguide/en/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/docs/userguide/en/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/docs/userguide/en/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>userguide-docs</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12-SEC/docs/userguide/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/docs/userguide/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/docs/userguide/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.component.ext/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.component.ext/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.component.ftp/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.component.ftp/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.component.statistics/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.component.statistics/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.component.webdav/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.component.webdav/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.connectors.localadapter/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.connectors.localadapter/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.12-SEC/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.framework.command/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.framework.command/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.framework.ftpclient/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.framework.ftpclient/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.12-SEC/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/exo.jcr.framework.web/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/exo.jcr.framework.web/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.12-SEC/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/packaging/module/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/packaging/module/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12-SEC/pom.xml
===================================================================
--- jcr/branches/1.12-SEC/pom.xml 2010-06-02 14:48:58 UTC (rev 2452)
+++ jcr/branches/1.12-SEC/pom.xml 2010-06-02 15:19:13 UTC (rev 2453)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
+ <version>1.12-SEC-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
13 years, 12 months
exo-jcr SVN: r2452 - jcr/branches.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-02 10:48:58 -0400 (Wed, 02 Jun 2010)
New Revision: 2452
Added:
jcr/branches/1.12-SEC/
Log:
1.12-SEC branch added
Copied: jcr/branches/1.12-SEC (from rev 2451, jcr/trunk)
13 years, 12 months
exo-jcr SVN: r2451 - core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-06-02 10:37:24 -0400 (Wed, 02 Jun 2010)
New Revision: 2451
Modified:
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java
Log:
EXOJCR-765 String concatenation replaced with StringBuilder.append()
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2010-06-02 12:23:09 UTC (rev 2450)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2010-06-02 14:37:24 UTC (rev 2451)
@@ -67,7 +67,7 @@
throw new NullPointerException("InputStream is null.");
}
- String text = "";
+ StringBuilder builder = new StringBuilder("");
try
{
@@ -78,7 +78,7 @@
}
catch (IOException e)
{
- return text;
+ return builder.toString();
}
for (int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++)
{
@@ -105,25 +105,25 @@
{
Date date = HSSFDateUtil.getJavaDate(d);
String cellText = this.DATE_FORMAT.format(date);
- text = text + cellText + " ";
+ builder.append(cellText).append(" ");
}
else
{
- text = text + d + " ";
+ builder.append(d).append(" ");
}
break;
}
case HSSFCell.CELL_TYPE_FORMULA :
- text = text + cell.getCellFormula().toString() + " ";
+ builder.append(cell.getCellFormula().toString()).append(" ");
break;
case HSSFCell.CELL_TYPE_BOOLEAN :
- text = text + cell.getBooleanCellValue() + " ";
+ builder.append(cell.getBooleanCellValue()).append(" ");
break;
case HSSFCell.CELL_TYPE_ERROR :
- text = text + cell.getErrorCellValue() + " ";
+ builder.append(cell.getErrorCellValue()).append(" ");
break;
case HSSFCell.CELL_TYPE_STRING :
- text = text + cell.getStringCellValue().toString() + " ";
+ builder.append(cell.getStringCellValue().toString()).append(" ");
break;
default :
break;
@@ -148,7 +148,7 @@
}
}
}
- return text;
+ return builder.toString();
}
public String getContentAsText(InputStream is, String encoding) throws IOException, DocumentReadException
13 years, 12 months
exo-jcr SVN: r2450 - in jcr/trunk/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache and 2 other directories.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-06-02 08:23:09 -0400 (Wed, 02 Jun 2010)
New Revision: 2450
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java
Log:
EXOJCR-763: Samename nodes reordering now updates all child in cache.
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-02 09:19:44 UTC (rev 2449)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-02 12:23:09 UTC (rev 2450)
@@ -424,7 +424,6 @@
<exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude>
- <exclude>org/exoplatform/services/jcr/**/usecases/TestOrderBeforeOnTree.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -694,7 +693,6 @@
<exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude>
- <exclude>org/exoplatform/services/jcr/**/usecases/TestOrderBeforeOnTree.java</exclude>
<!-- From TCK -->
<exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude>
<exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude>
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-02 09:19:44 UTC (rev 2449)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-06-02 12:23:09 UTC (rev 2450)
@@ -836,6 +836,7 @@
cache.addToList(makeChildListFqn(childNodesList, node.getParentIdentifier()), ITEM_LIST, node
.getIdentifier());
}
+
}
// add in ITEMS
return (ItemData)cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node);
@@ -901,9 +902,15 @@
.getIdentifier());
// remove from CHILD_NODES as parent
- cache.removeNode(makeChildListFqn(childNodes, item.getIdentifier()));
+ Fqn<String> parentFqn = makeChildListFqn(childNodes, item.getIdentifier());
+ Node<Serializable, Object> parent = cache.getNode(parentFqn);
+ if (parent != null && parent.isLeaf())
+ {
+ cache.removeNode(parentFqn);
+ }
// remove from CHILD_NODES_LIST as parent
+
cache.removeNode(makeChildListFqn(childNodesList, item.getIdentifier()));
// remove from CHILD_PROPS as parent
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java 2010-06-02 09:19:44 UTC (rev 2449)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestOrderBefore.java 2010-06-02 12:23:09 UTC (rev 2450)
@@ -808,15 +808,7 @@
testBase.orderBefore("n1[3]", null);
String[] order = new String[]{"n1", "n1[2]", "n1[3]", "n2", "n1[4]"}; // n1
- // [
- // 3
- // ]
- // -
- // >
- // n1
- // [
- // 4
- // ]
+ // [3]->n1[4]
checkOrder(order);
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java 2010-06-02 09:19:44 UTC (rev 2449)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestOrderBeforeOnTree.java 2010-06-02 12:23:09 UTC (rev 2450)
@@ -19,8 +19,10 @@
import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.jcr.impl.core.PropertyImpl;
import javax.jcr.Node;
+import javax.jcr.PropertyIterator;
/**
* Created by The eXo Platform SAS.
@@ -98,8 +100,13 @@
fail("Expected path " + expectedPath + " but was " + realPath);
}
+ //check properties path
+ PropertyIterator pit = n.getProperties();
+ while (pit.hasNext())
+ {
+ PropertyImpl p = (PropertyImpl)pit.nextProperty();
+ assertEquals(expectedPath, p.getInternalPath().makeParentPath());
+ }
}
-
}
-
}
13 years, 12 months
exo-jcr SVN: r2449 - jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-06-02 05:19:44 -0400 (Wed, 02 Jun 2010)
New Revision: 2449
Modified:
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingleIndex.java
Log:
EXOJCR-684: enabling NRT, removing writer.commit().
Modified: jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingleIndex.java
===================================================================
--- jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingleIndex.java 2010-06-02 06:53:05 UTC (rev 2448)
+++ jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SingleIndex.java 2010-06-02 09:19:44 UTC (rev 2449)
@@ -141,7 +141,7 @@
writer.addDocument(doc);
}
}
- writer.commit();
+ //writer.commit();
}
/**
@@ -155,7 +155,7 @@
if (!reader.isCurrent())
{
IndexReader oldReader = reader;
- reader = reader.reopen();
+ reader = writer.getReader(); //reader.reopen();
if (reader != oldReader)
{
oldReader.close();
13 years, 12 months
exo-jcr SVN: r2448 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-06-02 02:53:05 -0400 (Wed, 02 Jun 2010)
New Revision: 2448
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
Log:
EXOJCR-762 : Add checking repository exists before start restore repository.
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-06-01 09:06:55 UTC (rev 2447)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-06-02 06:53:05 UTC (rev 2448)
@@ -1363,6 +1363,17 @@
Map<String, String> workspaceNamesCorrespondMap, boolean asynchronous) throws BackupOperationException,
BackupConfigurationException, RepositoryException, RepositoryConfigurationException
{
+ // Checking repository exists.
+ try
+ {
+ repoService.getRepository(repositoryEntry.getName());
+ throw new BackupConfigurationException("Repository \"" + repositoryEntry.getName() + "\" is already exists.");
+ }
+ catch (RepositoryException e)
+ {
+ //OK. Repository with "repositoryEntry.getName" is not exists.
+ }
+
Map<String, BackupChainLog> workspacesMapping = new HashedMap();
Map<String, BackupChainLog> backups = new HashedMap();
13 years, 12 months
exo-jcr SVN: r2447 - jcr/branches/1.12-LIC-709.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-06-01 05:06:55 -0400 (Tue, 01 Jun 2010)
New Revision: 2447
Modified:
jcr/branches/1.12-LIC-709/pom.xml
Log:
EXOJCR-744: updated dependency version in pom.xml
Modified: jcr/branches/1.12-LIC-709/pom.xml
===================================================================
--- jcr/branches/1.12-LIC-709/pom.xml 2010-06-01 08:53:20 UTC (rev 2446)
+++ jcr/branches/1.12-LIC-709/pom.xml 2010-06-01 09:06:55 UTC (rev 2447)
@@ -262,17 +262,17 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.4.1</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-spellchecker</artifactId>
- <version>2.4.1</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
- <version>2.4.1</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.stream</groupId>
13 years, 12 months