exo-jcr SVN: r2776 - in jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr: lab and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-07-13 07:48:53 -0400 (Tue, 13 Jul 2010)
New Revision: 2776
Added:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java
Removed:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/ispn/
Log:
EXOJCR-837: move test to another packet
Added: jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java (rev 0)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java 2010-07-13 11:48:53 UTC (rev 2776)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.jcr.lab.infinispan;
+
+import junit.framework.TestCase;
+
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.manager.EmbeddedCacheManager;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author <a href="anatoliy.bazko(a)exoplatform.org">Anatoliy Bazko</a>
+ * @version $Id: TestINSPCache.java 111 2010-11-11 11:11:11Z tolusha $
+ *
+ */
+public class TestISPNCache extends TestCase
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+ /**
+ * Test default cache and base operation.
+ *
+ * @throws Exception
+ */
+ public void testGetCache() throws Exception
+ {
+ // Create cache manager
+ GlobalConfiguration myGlobalConfig = new GlobalConfiguration();
+ EmbeddedCacheManager manager = new DefaultCacheManager(myGlobalConfig);
+
+ // Create a cache
+ Configuration config = new Configuration();
+ manager.defineConfiguration("cache", config);
+ Cache cache = manager.getCache("cache");
+
+ cache.put("key", "value");
+ assertTrue(cache.size() == 1);
+ assertTrue(cache.containsKey("key"));
+
+ String value = (String)cache.remove("key");
+ assertTrue(value.equals("value"));
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value");
+ cache.putIfAbsent("key", "newValue");
+ assertTrue("value".equals(cache.get("key")));
+
+ cache.clear();
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value", 2, TimeUnit.SECONDS);
+ assertTrue(cache.containsKey("key"));
+ Thread.sleep(2000);
+ assertFalse(cache.containsKey("key"));
+ }
+
+ /**
+ * Test cluster cache and base operation.
+ *
+ * @throws Exception
+ */
+ public void testGetClusterCache() throws Exception
+ {
+ // Create cache manager
+ EmbeddedCacheManager manager = new DefaultCacheManager(GlobalConfiguration.getClusteredDefault());
+
+ // Create a cache
+ Cache cache = manager.getCache();
+
+ cache.put("key", "value");
+ assertTrue(cache.size() == 1);
+ assertTrue(cache.containsKey("key"));
+
+ String value = (String)cache.remove("key");
+ assertTrue(value.equals("value"));
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value");
+ cache.putIfAbsent("key", "newValue");
+ assertTrue("value".equals(cache.get("key")));
+
+ cache.clear();
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value", 2, TimeUnit.SECONDS);
+ assertTrue(cache.containsKey("key"));
+ Thread.sleep(2000);
+ assertFalse(cache.containsKey("key"));
+ }
+}
15 years, 10 months
exo-jcr SVN: r2775 - in jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl: ispn and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-07-13 07:37:50 -0400 (Tue, 13 Jul 2010)
New Revision: 2775
Added:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/ispn/
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/ispn/TestISPNCache.java
Log:
EXOJCR-837: simple test
Added: jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/ispn/TestISPNCache.java
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/ispn/TestISPNCache.java (rev 0)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/ispn/TestISPNCache.java 2010-07-13 11:37:50 UTC (rev 2775)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.jcr.impl.ispn;
+
+import junit.framework.TestCase;
+
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.manager.EmbeddedCacheManager;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author <a href="anatoliy.bazko(a)exoplatform.org">Anatoliy Bazko</a>
+ * @version $Id: TestINSPCache.java 111 2010-11-11 11:11:11Z tolusha $
+ *
+ */
+public class TestISPNCache extends TestCase
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+ /**
+ * Test default cache and base operation.
+ *
+ * @throws Exception
+ */
+ public void testGetCache() throws Exception
+ {
+ // Create cache manager
+ GlobalConfiguration myGlobalConfig = new GlobalConfiguration();
+ EmbeddedCacheManager manager = new DefaultCacheManager(myGlobalConfig);
+
+ // Create a cache
+ Configuration config = new Configuration();
+ manager.defineConfiguration("cache", config);
+ Cache cache = manager.getCache("cache");
+
+ cache.put("key", "value");
+ assertTrue(cache.size() == 1);
+ assertTrue(cache.containsKey("key"));
+
+ String value = (String)cache.remove("key");
+ assertTrue(value.equals("value"));
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value");
+ cache.putIfAbsent("key", "newValue");
+ assertTrue("value".equals(cache.get("key")));
+
+ cache.clear();
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value", 2, TimeUnit.SECONDS);
+ assertTrue(cache.containsKey("key"));
+ Thread.sleep(2000);
+ assertFalse(cache.containsKey("key"));
+ }
+
+ /**
+ * Test cluster cache and base operation.
+ *
+ * @throws Exception
+ */
+ public void testGetClusterCache() throws Exception
+ {
+ // Create cache manager
+ EmbeddedCacheManager manager = new DefaultCacheManager(GlobalConfiguration.getClusteredDefault());
+
+ // Create a cache
+ Cache cache = manager.getCache();
+
+ cache.put("key", "value");
+ assertTrue(cache.size() == 1);
+ assertTrue(cache.containsKey("key"));
+
+ String value = (String)cache.remove("key");
+ assertTrue(value.equals("value"));
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value");
+ cache.putIfAbsent("key", "newValue");
+ assertTrue("value".equals(cache.get("key")));
+
+ cache.clear();
+ assertTrue(cache.isEmpty());
+
+ cache.put("key", "value", 2, TimeUnit.SECONDS);
+ assertTrue(cache.containsKey("key"));
+ Thread.sleep(2000);
+ assertFalse(cache.containsKey("key"));
+ }
+}
15 years, 10 months
exo-jcr SVN: r2774 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-07-13 04:51:20 -0400 (Tue, 13 Jul 2010)
New Revision: 2774
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java
Log:
EXOJCR-835 JCR_xCONTAINER is now dropped on tearDown
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java 2010-07-13 08:03:04 UTC (rev 2773)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java 2010-07-13 08:51:20 UTC (rev 2774)
@@ -81,6 +81,7 @@
st.executeUpdate("drop table JCR_MREF");
st.executeUpdate("drop table JCR_MVALUE");
st.executeUpdate("drop table JCR_MITEM");
+ st.executeUpdate("drop table JCR_MCONTAINER");
st.close();
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2010-07-13 08:03:04 UTC (rev 2773)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2010-07-13 08:51:20 UTC (rev 2774)
@@ -79,6 +79,7 @@
st.executeUpdate("drop table JCR_SREF");
st.executeUpdate("drop table JCR_SVALUE");
st.executeUpdate("drop table JCR_SITEM");
+ st.executeUpdate("drop table JCR_SCONTAINER");
st.close();
}
catch (SQLException se)
15 years, 10 months
exo-jcr SVN: r2773 - jcr/branches/1.12.x/exo.jcr.component.ext.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-07-13 04:03:04 -0400 (Tue, 13 Jul 2010)
New Revision: 2773
Modified:
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
Log:
EXOJCR-751: fix pom.xml version
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-07-13 07:47:19 UTC (rev 2772)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-07-13 08:03:04 UTC (rev 2773)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.12.3-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
15 years, 10 months
exo-jcr SVN: r2772 - jcr/branches/1.12.x/exo.jcr.component.ext.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-07-13 03:47:19 -0400 (Tue, 13 Jul 2010)
New Revision: 2772
Modified:
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
Log:
EXOJCR-751: restore pom.xml
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-07-13 07:30:40 UTC (rev 2771)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-07-13 07:47:19 UTC (rev 2772)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.3-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
@@ -166,9 +166,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
- <include>**/**/MetaDataActionTest.java</include>
-
- <!-- include>**/actions/*Test.java</include>
+ <include>**/actions/*Test.java</include>
<include>**/metadata/*Test.java</include>
<include>**/owner/*Test.java</include>
<include>**/registry/*Test.java</include>
@@ -177,7 +175,7 @@
<include>**/groovy/*Test.java</include>
<include>**/replication/*.java</include>
<include>**/replication/external/*.java</include>
- <include>**/replication/async/**/*.java</include -->
+ <include>**/replication/async/**/*.java</include>
</includes>
<excludes>
<exclude>**/BaseStandaloneTest.java</exclude>
15 years, 10 months
exo-jcr SVN: r2771 - in jcr/branches/1.14-ISPN: exo.jcr.component.core and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-07-13 03:30:40 -0400 (Tue, 13 Jul 2010)
New Revision: 2771
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
jcr/branches/1.14-ISPN/pom.xml
Log:
EXOJCR-829: adding dependency for Infinispan 4.1.CR1
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-07-13 07:30:40 UTC (rev 2771)
@@ -206,6 +206,11 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-tests</artifactId>
Modified: jcr/branches/1.14-ISPN/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
+++ jcr/branches/1.14-ISPN/pom.xml 2010-07-13 07:30:40 UTC (rev 2771)
@@ -391,6 +391,11 @@
<artifactId>aspectjrt</artifactId>
<version>1.6.8</version>
</dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <version>4.1.0.CR1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
15 years, 10 months
exo-jcr SVN: r2770 - in jcr/branches/1.14-ISPN: applications and 26 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-07-12 09:37:10 -0400 (Mon, 12 Jul 2010)
New Revision: 2770
Modified:
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.14-ISPN/applications/exo.jcr.ear/pom.xml
jcr/branches/1.14-ISPN/applications/pom.xml
jcr/branches/1.14-ISPN/docs/pom.xml
jcr/branches/1.14-ISPN/docs/reference/en/pom.xml
jcr/branches/1.14-ISPN/docs/reference/pom.xml
jcr/branches/1.14-ISPN/docs/userguide/en/pom.xml
jcr/branches/1.14-ISPN/docs/userguide/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.ftp/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.statistics/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.webdav/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml
jcr/branches/1.14-ISPN/exo.jcr.framework.command/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.framework.web/pom.xml
jcr/branches/1.14-ISPN/packaging/module/pom.xml
jcr/branches/1.14-ISPN/pom.xml
Log:
EXOJCR-828 pom's version updated
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.backupconsole/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.backupconsole/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.browser/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.browser/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.config/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.config/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.fckeditor/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.fckeditor/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jboss/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jboss/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-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.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jonas/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.jonas/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-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.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.rest/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.rest/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.applications.tomcat/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.applications.tomcat/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.cluster.testclient/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.cluster.testclient/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.14-ISPN/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/exo.jcr.ear/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/exo.jcr.ear/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.14-ISPN/applications/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/applications/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/applications/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.14-ISPN/docs/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/docs/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/docs/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-ISPN/docs/reference/en/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/docs/reference/en/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/docs/reference/en/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>reference-docs</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-ISPN/docs/reference/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/docs/reference/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/docs/reference/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-ISPN/docs/userguide/en/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/docs/userguide/en/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/docs/userguide/en/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>userguide-docs</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-ISPN/docs/userguide/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/docs/userguide/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/docs/userguide/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.ftp/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.ftp/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.statistics/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.statistics/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.webdav/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.webdav/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -25,7 +25,7 @@
<display-name>JCR repository</display-name>
<vendor-name>exoplatform</vendor-name>
<eis-type />
- <resourceadapter-version>1.14.0-Beta01-SNAPSHOT</resourceadapter-version>
+ <resourceadapter-version>1.14-ISPN-SNAPSHOT</resourceadapter-version>
<license>
<license-required>false</license-required>
</license>
Modified: jcr/branches/1.14-ISPN/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.framework.command/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.framework.command/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.framework.ftpclient/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.framework.ftpclient/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.14-ISPN/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.framework.web/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/exo.jcr.framework.web/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.14-ISPN/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/packaging/module/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/packaging/module/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.14-ISPN/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/pom.xml 2010-07-12 13:08:28 UTC (rev 2769)
+++ jcr/branches/1.14-ISPN/pom.xml 2010-07-12 13:37:10 UTC (rev 2770)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta01-SNAPSHOT</version>
+ <version>1.14-ISPN-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.14-ISPN</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.14-ISPN</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.14-ISPN</url>
</scm>
<properties>
15 years, 10 months
exo-jcr SVN: r2769 - jcr/branches.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-07-12 09:08:28 -0400 (Mon, 12 Jul 2010)
New Revision: 2769
Added:
jcr/branches/1.14-ISPN/
Log:
EXOJCR-828 added 1.14-ISPN branch for Infinispan research.
Copied: jcr/branches/1.14-ISPN (from rev 2768, jcr/trunk)
15 years, 10 months
exo-jcr SVN: r2768 - jcr/trunk/exo.jcr.component.core.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-07-12 06:37:47 -0400 (Mon, 12 Jul 2010)
New Revision: 2768
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
Log:
EXOJCR-825 ${env.MAVEN_OPTS} added to surefire plugin argline
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-07-12 10:09:26 UTC (rev 2767)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-07-12 10:37:47 UTC (rev 2768)
@@ -379,7 +379,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+ <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
<systemProperties>
<property>
<name>jcr.test.configuration.file</name>
@@ -575,7 +575,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- TAKE CARE TO UPDATE ALSO run-all PROFILE -->
- <argLine>-Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+ <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
<systemProperties>
<property>
<name>jcr.test.configuration.file</name>
@@ -648,7 +648,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- TAKE CARE TO UPDATE ALSO run-tck PROFILE -->
- <argLine>-Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
+ <argLine>${env.MAVEN_OPTS} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
<systemProperties>
<property>
<name>jcr.test.configuration.file</name>
15 years, 10 months
exo-jcr SVN: r2767 - in jcr/trunk: exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-07-12 06:09:26 -0400 (Mon, 12 Jul 2010)
New Revision: 2767
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
Log:
EXOJCR-837: fix ClassCastException, more shortly solution
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-07-12 09:22:10 UTC (rev 2766)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-07-12 10:09:26 UTC (rev 2767)
@@ -441,75 +441,19 @@
public void restore() throws IOException
{
- int index = 0;
- int restoredItemStateId = index < listFixupStream.size() ? listFixupStream.get(index).getItemSateId() : -1;
- int restoredValueDataId = index < listFixupStream.size() ? listFixupStream.get(index).getValueDataId() : -1;
-
- TransactionChangesLog restoredItemDataChangesLog = new TransactionChangesLog();
-
- ChangesLogIterator logIterator = itemDataChangesLog.getLogIterator();
- int curItemStateId = 0;
- while (logIterator.hasNextLog())
+ List<ItemState> listItemState = itemDataChangesLog.getAllStates();
+ for (int i = 0; i < this.listFixupStream.size(); i++)
{
- List<ItemState> restoredItems = new ArrayList<ItemState>();
+ ItemState itemState = listItemState.get(listFixupStream.get(i).getItemSateId());
+ ItemData itemData = itemState.getData();
- PlainChangesLog log = logIterator.nextLog();
- for (ItemState item : log.getAllStates())
- {
- if (curItemStateId != restoredItemStateId)
- {
- restoredItems.add(item);
- }
- else
- {
- List<ValueData> restoredValues = new ArrayList<ValueData>();
+ PersistedPropertyData propertyData = (PersistedPropertyData)itemData;
+ ValueData vd = (propertyData.getValues().get(listFixupStream.get(i).getValueDataId()));
- PersistedPropertyData propertyData = (PersistedPropertyData)item.getData();
- for (int curValueDataId = 0; curValueDataId < propertyData.getValues().size(); curValueDataId++)
- {
- ValueData valueData = propertyData.getValues().get(curValueDataId);
-
- if (curItemStateId == restoredItemStateId && curValueDataId == restoredValueDataId)
- {
- // reinit valuedata
- ValueData restoredValueData =
- new StreamPersistedValueData(valueData.getOrderNumber(), new SpoolFile(listFile.get(index)
- .getAbsolutePath()));
-
- restoredValues.add(restoredValueData);
-
- index++;
- restoredItemStateId =
- index < listFixupStream.size() ? listFixupStream.get(index).getItemSateId() : -1;
- restoredValueDataId =
- index < listFixupStream.size() ? listFixupStream.get(index).getValueDataId() : -1;
- }
- else
- {
- restoredValues.add(valueData);
- }
- }
-
- PersistedPropertyData restoredPropertyData =
- new PersistedPropertyData(propertyData.getIdentifier(), propertyData.getQPath(), propertyData
- .getParentIdentifier(), propertyData.getPersistedVersion(), propertyData.getType(),
- propertyData.isMultiValued(), restoredValues);
-
- ItemState restoredItem =
- new ItemState(restoredPropertyData, item.getState(), item.isEventFire(), item.getAncestorToSave(),
- item.isInternallyCreated(), item.isPersisted());
-
- restoredItems.add(restoredItem);
- }
-
- curItemStateId++;
- }
-
- PlainChangesLog restoredLog =
- new PlainChangesLogImpl(restoredItems, log.getSessionId(), log.getEventType(), log.getPairId());
- restoredItemDataChangesLog.addLog(restoredLog);
+ // re-init the value
+ propertyData.getValues().set(listFixupStream.get(i).getValueDataId(),
+ new StreamPersistedValueData(vd.getOrderNumber(), new SpoolFile(listFile.get(i).getAbsolutePath())));
}
- itemDataChangesLog = restoredItemDataChangesLog;
for (int i = 0; i < listFile.size(); i++)
fileCleaner.addFile(listFile.get(i));
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2010-07-12 09:22:10 UTC (rev 2766)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2010-07-12 10:09:26 UTC (rev 2767)
@@ -18,10 +18,7 @@
*/
package org.exoplatform.services.jcr.ext.backup.impl;
-import org.exoplatform.services.jcr.dataflow.ChangesLogIterator;
import org.exoplatform.services.jcr.dataflow.ItemState;
-import org.exoplatform.services.jcr.dataflow.PlainChangesLog;
-import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl;
import org.exoplatform.services.jcr.dataflow.TransactionChangesLog;
import org.exoplatform.services.jcr.dataflow.persistent.PersistedPropertyData;
import org.exoplatform.services.jcr.datamodel.ItemData;
@@ -486,75 +483,19 @@
{
// TODO same code as in BackupWorkspaceInitializer?
- int index = 0;
- int restoredItemStateId = index < listFixupStream.size() ? listFixupStream.get(index).getItemSateId() : -1;
- int restoredValueDataId = index < listFixupStream.size() ? listFixupStream.get(index).getValueDataId() : -1;
-
- TransactionChangesLog restoredItemDataChangesLog = new TransactionChangesLog();
-
- ChangesLogIterator logIterator = itemDataChangesLog.getLogIterator();
- int curItemStateId = 0;
- while (logIterator.hasNextLog())
+ List<ItemState> listItemState = itemDataChangesLog.getAllStates();
+ for (int i = 0; i < this.listFixupStream.size(); i++)
{
- List<ItemState> restoredItems = new ArrayList<ItemState>();
+ ItemState itemState = listItemState.get(listFixupStream.get(i).getItemSateId());
+ ItemData itemData = itemState.getData();
- PlainChangesLog log = logIterator.nextLog();
- for (ItemState item : log.getAllStates())
- {
- if (curItemStateId != restoredItemStateId)
- {
- restoredItems.add(item);
- }
- else
- {
- List<ValueData> restoredValues = new ArrayList<ValueData>();
+ PersistedPropertyData propertyData = (PersistedPropertyData)itemData;
+ ValueData vd = (propertyData.getValues().get(listFixupStream.get(i).getValueDataId()));
- PersistedPropertyData propertyData = (PersistedPropertyData)item.getData();
- for (int curValueDataId = 0; curValueDataId < propertyData.getValues().size(); curValueDataId++)
- {
- ValueData valueData = propertyData.getValues().get(curValueDataId);
-
- if (curItemStateId == restoredItemStateId && curValueDataId == restoredValueDataId)
- {
- // reinit valuedata
- ValueData restoredValueData =
- new StreamPersistedValueData(valueData.getOrderNumber(), new SpoolFile(listFile.get(index)
- .getAbsolutePath()));
-
- restoredValues.add(restoredValueData);
-
- index++;
- restoredItemStateId =
- index < listFixupStream.size() ? listFixupStream.get(index).getItemSateId() : -1;
- restoredValueDataId =
- index < listFixupStream.size() ? listFixupStream.get(index).getValueDataId() : -1;
- }
- else
- {
- restoredValues.add(valueData);
- }
- }
-
- PersistedPropertyData restoredPropertyData =
- new PersistedPropertyData(propertyData.getIdentifier(), propertyData.getQPath(), propertyData
- .getParentIdentifier(), propertyData.getPersistedVersion(), propertyData.getType(), propertyData
- .isMultiValued(), restoredValues);
-
- ItemState restoredItem =
- new ItemState(restoredPropertyData, item.getState(), item.isEventFire(), item.getAncestorToSave(),
- item.isInternallyCreated(), item.isPersisted());
-
- restoredItems.add(restoredItem);
- }
-
- curItemStateId++;
- }
-
- PlainChangesLog restoredLog =
- new PlainChangesLogImpl(restoredItems, log.getSessionId(), log.getEventType(), log.getPairId());
- restoredItemDataChangesLog.addLog(restoredLog);
+ // re-init the value
+ propertyData.getValues().set(listFixupStream.get(i).getValueDataId(),
+ new StreamPersistedValueData(vd.getOrderNumber(), new SpoolFile(listFile.get(i).getAbsolutePath())));
}
- itemDataChangesLog = restoredItemDataChangesLog;
if (listRandomAccessFile != null)
for (int i = 0; i < listRandomAccessFile.size(); i++)
15 years, 10 months