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

exo-jcr SVN: r1546 - in kernel/trunk: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-22 11:45:17 -0500 (Fri, 22 Jan 2010) New Revision: 1546 Modified: 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.jboss.v3/pom.xml kernel/trunk/exo.kernel.component.remote/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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.commons/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.common</artifactId> 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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> Modified: kernel/trunk/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.remote/pom.xml 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.container/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <artifactId>exo.kernel.container</artifactId> 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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-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 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/packaging/module/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2010-01-22 16:44:51 UTC (rev 1545) +++ kernel/trunk/pom.xml 2010-01-22 16:45:17 UTC (rev 1546) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06</version> + <version>2.2.0-CR1-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -42,9 +42,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.0-Beta06</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.0-Beta06</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.0-Beta06</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>

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1545 - kernel/tags.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-22 11:44:51 -0500 (Fri, 22 Jan 2010) New Revision: 1545 Added: kernel/tags/2.2.0-Beta06/ Log: [maven-scm] copy for tag 2.2.0-Beta06 Copied: kernel/tags/2.2.0-Beta06 (from rev 1544, kernel/trunk)

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1544 - in kernel/trunk: exo.kernel.commons and 12 other directories.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-22 11:44:30 -0500 (Fri, 22 Jan 2010) New Revision: 1544 Modified: 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.jboss.v3/pom.xml kernel/trunk/exo.kernel.component.remote/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.2.0-Beta06 Modified: kernel/trunk/exo.kernel.commons/pom.xml =================================================================== --- kernel/trunk/exo.kernel.commons/pom.xml 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.commons/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <artifactId>exo.kernel.commons</artifactId> Modified: kernel/trunk/exo.kernel.component.cache/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.cache/pom.xml 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.component.cache/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.component.command/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <artifactId>exo.kernel.component.common</artifactId> 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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> Modified: kernel/trunk/exo.kernel.component.remote/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.remote/pom.xml 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.component.remote/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <artifactId>exo.kernel.component.remote</artifactId> Modified: kernel/trunk/exo.kernel.container/pom.xml =================================================================== --- kernel/trunk/exo.kernel.container/pom.xml 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.container/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <artifactId>exo.kernel.container</artifactId> 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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>mc-integration-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</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 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <artifactId>mc-integration-parent</artifactId> Modified: kernel/trunk/packaging/module/pom.xml =================================================================== --- kernel/trunk/packaging/module/pom.xml 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/packaging/module/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -2,7 +2,7 @@ <parent> <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2010-01-22 12:31:29 UTC (rev 1543) +++ kernel/trunk/pom.xml 2010-01-22 16:44:30 UTC (rev 1544) @@ -30,7 +30,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>kernel-parent</artifactId> - <version>2.2.0-Beta06-SNAPSHOT</version> + <version>2.2.0-Beta06</version> <packaging>pom</packaging> <name>eXo Kernel</name> @@ -42,9 +42,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.2.0-Beta06</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.0-Beta06</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.0-Beta06</url> </scm> <modules>

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1543 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: core/lock/jbosscache and 6 other directories.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-22 07:31:29 -0500 (Fri, 22 Jan 2010) New Revision: 1543 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/PropertyImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.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/core/version/VersionImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java Log: EXOJCR-347 copy ValueData for write operations; TODO cleanup; formatting 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 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -489,42 +489,6 @@ } /** - * Return child Nodes list. - * - * @return List of child Nodes - * @throws RepositoryException - * if error occurs - * @throws AccessDeniedException - * if Nodes cannot be listed due to permissions on this Node - */ - @Deprecated - private List<NodeImpl> childNodes() throws RepositoryException, AccessDeniedException - { - - List<NodeImpl> storedNodes = dataManager.getChildNodes(nodeData(), true); - Collections.sort(storedNodes, new NodesOrderComparator()); - return storedNodes; - } - - /** - * Return child Properties list. - * - * @return List of child Properties - * @throws RepositoryException - * if error occurs - * @throws AccessDeniedException - * if Properties cannot be listed due to permissions on this Node - */ - @Deprecated - private List<PropertyImpl> childProperties() throws RepositoryException, AccessDeniedException - { - - List<PropertyImpl> storedProperties = dataManager.getChildProperties(nodeData(), true); - Collections.sort(storedProperties, new PropertiesOrderComparator()); - return storedProperties; - } - - /** * {@inheritDoc} */ public void clearACL() throws RepositoryException, AccessControlException @@ -725,64 +689,6 @@ } /** - * Return Node corresponding to this Node. DEPRECATED. - * - * @param correspSession - * session on corresponding Workspace - * @return Node corresponding Node - * @throws ItemNotFoundException - * if corresponding Node not found - * @throws AccessDeniedException - * if read impossible due to permisions - * @throws RepositoryException - * if any other error occurs - */ - @Deprecated - public Node getCorrespondingNode(SessionImpl correspSession) throws ItemNotFoundException, AccessDeniedException, - RepositoryException - { - - if (this.isNodeType(Constants.MIX_REFERENCEABLE)) - { - try - { - return correspSession.getNodeByUUID(getUUID()); - } - catch (ItemNotFoundException e) - { - } - } - else - { - for (int i = getDepth(); i >= 0; i--) - { - NodeImpl ancestor = (NodeImpl)getAncestor(i); - if (ancestor.isNodeType(Constants.MIX_REFERENCEABLE)) - { - NodeImpl correspAncestor = (NodeImpl)correspSession.getNodeByUUID(ancestor.getUUID()); - JCRPath.PathElement[] relJCRPath = getLocation().getRelPath(getDepth() - i); - try - { - return correspAncestor.getNode(getRelPath(relJCRPath)); - } - catch (ItemNotFoundException e) - { - } - } - } - } - try - { - return (NodeImpl)correspSession.getItem(getPath()); - } - catch (PathNotFoundException e) - { - throw new ItemNotFoundException("No corresponding path for " + getPath() + " in " - + correspSession.getWorkspace().getName()); - } - } - - /** * Return Node corresponding to this Node. * * @param correspSession @@ -1749,11 +1655,15 @@ // Check if versionable ancestor is not checked-in if (!checkedOut()) + { throw new VersionException("Node " + getPath() + " or its nearest ancestor is checked-in"); + } // Check locking if (!checkLocking()) + { throw new LockException("Node " + getPath() + " is locked "); + } session.getActionHandler().preRemoveMixin(this, name); @@ -1769,11 +1679,15 @@ // remove mix:versionable stuff if (ntmanager.isNodeType(Constants.MIX_VERSIONABLE, removedName)) + { removeVersionable(); + } // remove mix:lockable stuff if (ntmanager.isNodeType(Constants.MIX_LOCKABLE, removedName)) + { removeLockable(); + } // Set mixin property and locally updateMixin(newMixin); @@ -1819,7 +1733,6 @@ */ public void removePermission(String identity) throws RepositoryException, AccessControlException { - if (!isNodeType(Constants.EXO_PRIVILEGEABLE)) throw new AccessControlException("Node is not exo:privilegeable " + getPath()); @@ -2640,11 +2553,15 @@ PropertyData existed = (PropertyData)dataManager.getItemData(nodeData(), new QPathEntry(name, 0)); if (existed == null) + { throw new RepositoryException("Property data is not found " + name.getAsString() + " for node " + nodeData().getQPath().getAsString()); + } if (!existed.isMultiValued()) + { throw new ValueFormatException("An existed property is single-valued " + name.getAsString()); + } TransientPropertyData tdata = new TransientPropertyData(QPath.makeChildPath(getInternalPath(), name), existed.getIdentifier(), existed @@ -2710,40 +2627,42 @@ { EntityCollection res = new EntityCollection(); - TransientPropertyData mergeFailed = (TransientPropertyData)dataManager.getItemData(nodeData(), new QPathEntry(Constants.JCR_MERGEFAILED, 0)); - List<ValueData> mergeFailedRefs = null; + List<ValueData> mergeFailedRefs = new ArrayList<ValueData>(); int state = 0; - if (mergeFailed != null) + try { - mergeFailed = - new TransientPropertyData(mergeFailed.getQPath(), mergeFailed.getIdentifier(), mergeFailed - .getPersistedVersion(), mergeFailed.getType(), mergeFailed.getParentIdentifier(), mergeFailed - .isMultiValued(), mergeFailed.getValues()); + if (mergeFailed != null) + { + for (ValueData mfvd : mergeFailed.getValues()) + { + mergeFailedRefs.add(new TransientValueData(mfvd.getAsByteArray())); + } - mergeFailedRefs = mergeFailed.getValues(); - state = ItemState.UPDATED; - } - else - { - mergeFailedRefs = new ArrayList<ValueData>(); - mergeFailed = - TransientPropertyData.createPropertyData((NodeData)getData(), Constants.JCR_MERGEFAILED, - PropertyType.REFERENCE, true, mergeFailedRefs); - state = ItemState.ADDED; - } + mergeFailed = + new TransientPropertyData(mergeFailed.getQPath(), mergeFailed.getIdentifier(), mergeFailed + .getPersistedVersion(), mergeFailed.getType(), mergeFailed.getParentIdentifier(), mergeFailed + .isMultiValued(), mergeFailedRefs); - nextFail : for (String identifier : failed.keySet()) - { - NodeImpl versionable = (NodeImpl)session.getNodeByUUID(identifier); - res.add(versionable); - String offendingIdentifier = failed.get(identifier); + state = ItemState.UPDATED; + } + else + { + mergeFailed = + TransientPropertyData.createPropertyData((NodeData)getData(), Constants.JCR_MERGEFAILED, + PropertyType.REFERENCE, true, mergeFailedRefs); + state = ItemState.ADDED; + } - for (ValueData vd : mergeFailedRefs) + nextFail : for (String identifier : failed.keySet()) { - try + NodeImpl versionable = (NodeImpl)session.getNodeByUUID(identifier); + res.add(versionable); + String offendingIdentifier = failed.get(identifier); + + for (ValueData vd : mergeFailedRefs) { String mfIdentifier = new String(vd.getAsByteArray()); if (mfIdentifier.equals(offendingIdentifier)) @@ -2752,18 +2671,19 @@ continue nextFail; } } - catch (IOException e) - { - throw new RepositoryException("jcr:mergeFailed read error " + e, e); - } + + mergeFailedRefs.add(new TransientValueData(offendingIdentifier)); } - mergeFailedRefs.add(new TransientValueData(offendingIdentifier)); - } + changes.add(new ItemState(mergeFailed, state, true, getInternalPath(), true)); - changes.add(new ItemState(mergeFailed, state, true, getInternalPath(), true)); + return res; - return res; + } + catch (IOException e) + { + throw new RepositoryException("jcr:mergeFailed read error " + e, e); + } } // ----------------------------- ExtendedNode ----------------------------- @@ -2818,33 +2738,6 @@ } - // old impl - @Deprecated - private int getNextChildIndex(InternalQName nameToAdd, List<NodeData> siblings, NodeData parentNode) - throws RepositoryException, ItemExistsException - { - - int ind = 0; - for (NodeData sibling : siblings) - { - if (sibling.getQPath().getName().equals(nameToAdd)) - { - NodeDefinitionData def = - session.getWorkspace().getNodeTypesHolder().getChildNodeDefinition(nameToAdd, - parentNode.getPrimaryTypeName(), parentNode.getMixinTypeNames()); - if (LOG.isDebugEnabled()) - LOG.debug("Calculate index for " + nameToAdd + " " + sibling.getQPath().getAsString()); - - if (def.isAllowsSameNameSiblings()) - ind++; - else - throw new ItemExistsException("The node " + nameToAdd + " already exists in " + getPath() - + " and same name sibling is not allowed "); - } - } - return ind + 1; - } - private NodeImpl doAddNode(NodeImpl parentNode, InternalQName name, InternalQName primaryTypeName) throws ItemExistsException, RepositoryException, ConstraintViolationException, VersionException, LockException { @@ -2892,23 +2785,6 @@ return node; } - private int getOrderNumber() - { - return nodeData().getOrderNumber(); - } - - private String getRelPath(JCRPath.PathElement[] relPath) - { - String path = ""; - for (int i = 0; i < relPath.length; i++) - { - path += relPath[i].getAsString(false); - if (i < relPath.length - 1) - path += "/"; - } - return path; - } - private boolean hasProperty(InternalQName name) { try @@ -2938,9 +2814,11 @@ { try { - String mfIdentifier = new String(mfvd.getAsByteArray()); - if (!mfIdentifier.equals(version.getUUID())) - mf.add(mfvd); + byte[] mfb = mfvd.getAsByteArray(); + if (!version.getUUID().equals(new String(mfb))) + { + mf.add(new TransientValueData(mfb)); + } } catch (IOException e) { @@ -3001,8 +2879,7 @@ List<AccessControlEntry> aces = acl.getPermissionEntries(); // new for (AccessControlEntry ace : aces) { - ValueData vd = new TransientValueData(ace); - permValues.add(vd); + permValues.add(new TransientValueData(ace)); } PropertyData permProp = @@ -3027,60 +2904,6 @@ // ===================== helpers ===================== - private static class NodesOrderComparator implements Comparator<NodeImpl> - { - public int compare(NodeImpl n1, NodeImpl n2) - { - return n1.getOrderNumber() - n2.getOrderNumber(); - } - } - - private static class PropertiesOrderComparator implements Comparator<PropertyImpl> - { - public int compare(PropertyImpl p1, PropertyImpl p2) - { - int r = 0; - try - { - InternalQName qname1 = p1.getLocation().getName().getInternalName(); - InternalQName qname2 = p2.getLocation().getName().getInternalName(); - if (qname1.equals(Constants.JCR_PRIMARYTYPE)) - { - r = Integer.MIN_VALUE; - } - else if (qname2.equals(Constants.JCR_PRIMARYTYPE)) - { - r = Integer.MAX_VALUE; - } - else if (qname1.equals(Constants.JCR_MIXINTYPES)) - { - r = Integer.MIN_VALUE + 1; - } - else if (qname2.equals(Constants.JCR_MIXINTYPES)) - { - r = Integer.MAX_VALUE - 1; - } - else if (qname1.equals(Constants.JCR_UUID)) - { - r = Integer.MIN_VALUE + 2; - } - else if (qname2.equals(Constants.JCR_UUID)) - { - r = Integer.MAX_VALUE - 2; - } - else - { - r = qname1.getAsString().compareTo(qname2.getAsString()); - } - } - catch (Exception e) - { - LOG.error("PropertiesOrderComparator error: " + e, e); - } - return r; - } - } - private static class PropertiesDataOrderComparator<P extends PropertyData> implements Comparator<P> { public int compare(P p1, P p2) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -128,22 +128,6 @@ /** * {@inheritDoc} */ - @Deprecated - void loadData(ItemData data, ItemDefinitionData itemDefinitionData) throws RepositoryException, - ConstraintViolationException - { - this.data = data; - this.propertyData = (PropertyData)data; - this.type = propertyData.getType(); - - this.location = null; - this.qpath = data.getQPath(); - this.propertyDef = (PropertyDefinitionData)itemDefinitionData; - } - - /** - * {@inheritDoc} - */ public ItemDefinitionData getItemDefinitionData() { return propertyDef; @@ -337,10 +321,6 @@ throw new RepositoryException("FATAL: property definition is NULL " + getPath() + " " + propertyData.getValues()); } - String name = - locationFactory.createJCRName(propertyDef.getName() != null ? propertyDef.getName() : Constants.JCR_ANY_NAME) - .getAsString(); - ExtendedNodeTypeManager nodeTypeManager = (ExtendedNodeTypeManager)session.getWorkspace().getNodeTypeManager(); Value[] defaultValues = new Value[propertyDef.getDefaultValues().length]; String[] propVal = propertyDef.getDefaultValues(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -163,7 +163,7 @@ * The current Transaction Manager */ private TransactionManager tm; - + private Cache<Serializable, Object> cache; private final Fqn<String> lockRoot; @@ -324,7 +324,7 @@ return cache.getChildrenNames(lockRoot).size(); } }; - + @Managed @ManagedDescription("The number of active locks") public int getNumLocks() @@ -360,9 +360,9 @@ } return false; - } + } }; - + /** * Check is LockManager contains lock. No matter it is in pending or persistent state. * @@ -378,7 +378,7 @@ catch (LockException e) { // ignore me will never occur - } + } return false; } @@ -489,7 +489,7 @@ log.error(e.getLocalizedMessage(), e); } } - + // sort locking and unlocking operations to avoid deadlocks in JBossCache Collections.sort(containers); for (LockOperationContainer container : containers) @@ -586,7 +586,7 @@ return null; } }; - + /** * Refreshed lock data in cache * @@ -656,9 +656,10 @@ */ private TransientItemData copyItemData(PropertyData prop) throws RepositoryException { - if (prop == null) + { return null; + } // make a copy, value may be null for deleting items TransientPropertyData newData = @@ -730,7 +731,7 @@ return cache.getRoot().hasChild(makeLockFqn(nodeId)); } }; - + private boolean lockExist(String nodeId) { try @@ -835,7 +836,7 @@ return (LockData)cache.get(makeLockFqn(nodeId), LOCK_DATA); } }; - + protected LockData getLockDataById(String nodeId) { try @@ -849,25 +850,26 @@ return null; } - private final LockActionNonTxAware<List<LockData>, Object> getLockList = new LockActionNonTxAware<List<LockData>, Object>() - { - public List<LockData> execute(Object arg) throws LockException + private final LockActionNonTxAware<List<LockData>, Object> getLockList = + new LockActionNonTxAware<List<LockData>, Object>() { - Set<Object> nodesId = cache.getChildrenNames(lockRoot); + public List<LockData> execute(Object arg) throws LockException + { + Set<Object> nodesId = cache.getChildrenNames(lockRoot); - List<LockData> locksData = new ArrayList<LockData>(); - for (Object nodeId : nodesId) - { - LockData lockData = (LockData)cache.get(makeLockFqn((String)nodeId), LOCK_DATA); - if (lockData != null) + List<LockData> locksData = new ArrayList<LockData>(); + for (Object nodeId : nodesId) { - locksData.add(lockData); + LockData lockData = (LockData)cache.get(makeLockFqn((String)nodeId), LOCK_DATA); + if (lockData != null) + { + locksData.add(lockData); + } } + return locksData; } - return locksData; - } - }; - + }; + protected synchronized List<LockData> getLockList() { try @@ -928,9 +930,11 @@ // lock probably removed by other thread if (lockOwner == null && lockIsDeep == null) + { return; + } + dataManager.save(new TransactionChangesLog(changesLog)); - } catch (JCRInvalidItemStateException e) { @@ -982,7 +986,7 @@ } node.setResident(true); } - + /** * Execute the given action outside a transaction. This is needed since the {@link Cache} used by {@link CacheableLockManager} * manages the persistence of its locks thanks to a {@link CacheLoader} and a {@link CacheLoader} lock the JBoss cache {@link Node} @@ -1020,9 +1024,9 @@ log.warn("Cannot resume the current transaction", e); } } - } + } } - + /** * Actions that are not supposed to be called within a transaction * Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -362,7 +362,9 @@ { List<ValueData> parents = new ArrayList<ValueData>(); for (InternalQName nt : value) + { parents.add(new TransientValueData(nt)); + } TransientPropertyData propertyData = TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.NAME, true, parents); @@ -385,7 +387,9 @@ for (String vc : value) { if (vc != null) + { valueDatas.add(new TransientValueData(vc)); + } } TransientPropertyData propertyData = Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -35,7 +35,7 @@ * Created by The eXo Platform SAS. * * @author <a href="mailto:Sergey.Kabashnyuk@gmail.com">Sergey Kabashnyuk</a> - * @version $Id: $ + * @version $Id$ */ public class PropertyDefinitionAccessProvider extends AbstractItemDefinitionAccessProvider { @@ -43,16 +43,13 @@ public PropertyDefinitionAccessProvider(DataManager dataManager) { super(dataManager); - } public PropertyDefinitionData read(NodeData nodeData, InternalQName declaringNodeType) throws NodeTypeReadException, RepositoryException - { if (Constants.NT_PROPERTYDEFINITION.equals(nodeData.getPrimaryTypeName())) { - // null if residual; InternalQName name = readName(nodeData, Constants.JCR_NAME); boolean protectedItem = readMandatoryBoolean(nodeData, Constants.JCR_PROTECTED); @@ -66,10 +63,10 @@ boolean multiple = readMandatoryBoolean(nodeData, Constants.JCR_MULTIPLE); - //3 Query atributes -// boolean isQueryOrderable = readMandatoryBoolean(nodeData, Constants.JCR_QUERYORDERABLE); -// String[] availableQueryOperators = readMandatoryStrings(nodeData, Constants.JCR_AVAILABLEQUERYOPERATORS); -// boolean isFullTextSearchable = readMandatoryBoolean(nodeData, Constants.JCR_ISFULLTEXTSEARCHABLE); + // TODO 3 Query atributes + // boolean isQueryOrderable = readMandatoryBoolean(nodeData, Constants.JCR_QUERYORDERABLE); + // String[] availableQueryOperators = readMandatoryStrings(nodeData, Constants.JCR_AVAILABLEQUERYOPERATORS); + // boolean isFullTextSearchable = readMandatoryBoolean(nodeData, Constants.JCR_ISFULLTEXTSEARCHABLE); String[] valueConstraints = readStrings(nodeData, Constants.JCR_VALUECONSTRAINTS); String[] defaultValues = readStrings(nodeData, Constants.JCR_DEFAULTVALUES); @@ -83,7 +80,6 @@ public void write(PlainChangesLog changesLog, NodeData declaredNodeType, PropertyDefinitionData propertyDefinitionData, int index) { - NodeData propertyDefinition = TransientNodeData.createNodeData(declaredNodeType, Constants.JCR_PROPERTYDEFINITION, Constants.NT_PROPERTYDEFINITION, index); @@ -98,13 +94,13 @@ writeBoolean(changesLog, propertyDefinition, Constants.JCR_MULTIPLE, propertyDefinitionData.isMultiple()); - //3 Query atributes -// writeBoolean(changesLog, propertyDefinition, Constants.JCR_QUERYORDERABLE, propertyDefinitionData -// .isQueryOrderable()); -// writeStrings(changesLog, propertyDefinition, Constants.JCR_AVAILABLEQUERYOPERATORS, propertyDefinitionData -// .getAvailableQueryOperators()); -// writeBoolean(changesLog, propertyDefinition, Constants.JCR_ISFULLTEXTSEARCHABLE, propertyDefinitionData -// .isFullTextSearchable()); + //TODO 3 Query atributes + // writeBoolean(changesLog, propertyDefinition, Constants.JCR_QUERYORDERABLE, propertyDefinitionData + // .isQueryOrderable()); + // writeStrings(changesLog, propertyDefinition, Constants.JCR_AVAILABLEQUERYOPERATORS, propertyDefinitionData + // .getAvailableQueryOperators()); + // writeBoolean(changesLog, propertyDefinition, Constants.JCR_ISFULLTEXTSEARCHABLE, propertyDefinitionData + // .isFullTextSearchable()); if (propertyDefinitionData.getValueConstraints() != null && propertyDefinitionData.getValueConstraints().length != 0) @@ -119,8 +115,6 @@ writeStrings(changesLog, propertyDefinition, Constants.JCR_DEFAULTVALUES, propertyDefinitionData .getDefaultValues()); - } } - } Property changes on: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -358,7 +358,7 @@ } else { - // TODO by stream... not equals + // by stream... not equals return false; } } 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 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -569,25 +569,28 @@ List<ValueData> predecessors = ((PropertyData)dataManager.getItemData(versionableNodeData, new QPathEntry(Constants.JCR_PREDECESSORS, 0))) .getValues(); + List<ValueData> predecessorsNew = new ArrayList<ValueData>(); for (ValueData predecessorValue : predecessors) { - String predecessorIdentifier; + byte[] pib; try { - predecessorIdentifier = new String(predecessorValue.getAsByteArray()); + pib = predecessorValue.getAsByteArray(); } catch (IOException e) { throw new RepositoryException(e); } - VersionImpl predecessor = (VersionImpl)dataManager.getItemByIdentifier(predecessorIdentifier, false); + VersionImpl predecessor = (VersionImpl)dataManager.getItemByIdentifier(new String(pib), false); predecessor.addSuccessor(versionData.getIdentifier(), changesLog); + + predecessorsNew.add(new TransientValueData(pib)); } // jcr:predecessors propData = TransientPropertyData.createPropertyData(versionData, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, - true, predecessors); + true, predecessorsNew); changesLog.add(ItemState.createAddedState(propData)); // jcr:frozenNode Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -53,7 +53,6 @@ * @author Gennady Azarenkov * @version $Id: VersionImpl.java 12311 2008-03-24 12:30:51Z pnedonosko $ */ - public class VersionImpl extends VersionStorageDescendantNode implements Version { @@ -67,8 +66,8 @@ } } + /* needed for VersionHistoryImpl.removeVersion */ @Override - /* needed for VersionHistoryImpl.removeVersion */ protected void invalidate() { super.invalidate(); @@ -142,7 +141,9 @@ (PropertyData)dataManager.getItemData(nodeData(), new QPathEntry(Constants.JCR_PREDECESSORS, 0)); if (predecessorsData == null) + { return new Version[0]; + } List<ValueData> predecessorsValues = predecessorsData.getValues(); Version[] predecessors = new Version[predecessorsValues.size()]; @@ -154,10 +155,14 @@ String videntifier = new String(predecessorsValues.get(i).getAsByteArray()); VersionImpl version = (VersionImpl)dataManager.getItemByIdentifier(videntifier, false); if (version != null) + { predecessors[i] = version; + } else + { throw new RepositoryException("Predecessor version is not found " + videntifier + ", this version " + getPath()); + } } } catch (IOException e) @@ -189,10 +194,18 @@ { // add successor List<ValueData> newSuccessorsValue = new ArrayList<ValueData>(); - for (ValueData svd : successorsProp.getValues()) + try { - newSuccessorsValue.add(svd); + for (ValueData svd : successorsProp.getValues()) + { + newSuccessorsValue.add(new TransientValueData(svd.getAsByteArray())); + } } + catch (IOException e) + { + throw new RepositoryException("jcr:successors read error " + e, e); + } + newSuccessorsValue.add(successorRef); TransientPropertyData newSuccessorsProp = @@ -224,10 +237,18 @@ { // add predeccessor List<ValueData> newPredeccessorValue = new ArrayList<ValueData>(); - for (ValueData svd : predeccessorsProp.getValues()) + try { - newPredeccessorValue.add(svd); + for (ValueData svd : predeccessorsProp.getValues()) + { + newPredeccessorValue.add(new TransientValueData(svd.getAsByteArray())); + } } + catch (IOException e) + { + throw new RepositoryException("jcr:predecessors read error " + e, e); + } + newPredeccessorValue.add(predeccessorRef); TransientPropertyData newPredeccessorsProp = @@ -251,9 +272,10 @@ { for (ValueData sdata : successorsProp.getValues()) { - if (!successorIdentifier.equals(new String(sdata.getAsByteArray()))) + byte[] sb = sdata.getAsByteArray(); + if (!successorIdentifier.equals(new String(sb))) { - newSuccessors.add(sdata); + newSuccessors.add(new TransientValueData(sb)); } } } @@ -290,9 +312,10 @@ { for (ValueData sdata : successorsProp.getValues()) { - if (!removedSuccessorIdentifier.equals(new String(sdata.getAsByteArray()))) + byte[] sb = sdata.getAsByteArray(); + if (!removedSuccessorIdentifier.equals(new String(sb))) { - newSuccessors.add(sdata); + newSuccessors.add(new TransientValueData(sb)); } } } @@ -329,9 +352,10 @@ { for (ValueData sdata : predeccessorsProp.getValues()) { - if (!predecessorIdentifier.equals(new String(sdata.getAsByteArray()))) + byte[] sb = sdata.getAsByteArray(); + if (!predecessorIdentifier.equals(new String(sb))) { - newPredeccessors.add(sdata); + newPredeccessors.add(new TransientValueData(sb)); } } } @@ -368,9 +392,10 @@ { for (ValueData sdata : predeccessorsProp.getValues()) { - if (!removedPredecessorIdentifier.equals(new String(sdata.getAsByteArray()))) + byte[] sb = sdata.getAsByteArray(); + if (!removedPredecessorIdentifier.equals(new String(sb))) { - newPredeccessors.add(sdata); + newPredeccessors.add(new TransientValueData(sb)); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/AbstractPersistedValueData.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -70,7 +70,7 @@ } /** - * Create transient copy of persisted data. + * Create transient copy of persisted data. Used for LocalWorkspaceStorageDataManagerProxy only. * * @return TransientValueData * @throws RepositoryException if error ocurs Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -501,12 +501,9 @@ public EditableValueData(byte[] bytes, int orderNumber, FileCleaner fileCleaner, int maxBufferSize, File tempDirectory) throws IOException { - this.delegate = new NewEditableValueData(bytes, orderNumber, fileCleaner, maxBufferSize, tempDirectory); - } - //TODO use InputStream instead of spoolFile and use Channel.transferFrom. public EditableValueData(File spoolFile, int orderNumber, FileCleaner fileCleaner, int maxBufferSize, File tempDirectory) throws IOException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -257,7 +257,6 @@ public long getLength() { // TODO try ask on FileChannel (via FileInputStream if have such stream). - if (isByteArrayAfterSpool()) { return data.length; @@ -359,7 +358,7 @@ MappedByteBuffer bb = spoolChannel.map(FileChannel.MapMode.READ_ONLY, position, length); - WritableByteChannel ch = Channels.newChannel(stream); // TODO don't use Channels.newChannel + WritableByteChannel ch = Channels.newChannel(stream); // TODO don't use Channels.newChannel on java5 ch.write(bb); ch.close(); @@ -656,8 +655,7 @@ try { - //TODO do refactor of work with NIO - + //TODO do refactor of work with NIO and java6 ByteBuffer bb = ByteBuffer.allocate((int)fch.size()); fch.read(bb); if (bb.hasArray()) @@ -834,6 +832,16 @@ /** * Creates TransientValueData with incoming byte array. + * @param value + * byte[] + */ + public TransientValueData(byte[] value) + { + this(0, value); + } + + /** + * Creates TransientValueData with incoming byte array. * @param orderNumber * int * @param value @@ -1101,8 +1109,7 @@ * @param orderNumber * int */ - // TODO make it protected - TransientValueData() + protected TransientValueData() { } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -197,8 +197,7 @@ */ private byte[] fileToByteArray() throws IOException { - // TODO do refactor of work with NIO - + // TODO do refactor of work with NIO and java6 FileChannel fch = new FileInputStream(file).getChannel(); try Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java 2010-01-22 12:17:25 UTC (rev 1542) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java 2010-01-22 12:31:29 UTC (rev 1543) @@ -181,7 +181,6 @@ public void startElement(String namespaceURI, String localName, String qName, Map<String, String> atts) throws RepositoryException { - String nodeName = ISO9075.decode(qName); if ("jcr:root".equals(nodeName)) @@ -240,18 +239,14 @@ } newProperty = endPrimaryType(nodeData.getPrimaryTypeName()); - } else if (propName.equals(Constants.JCR_MIXINTYPES)) { - newProperty = endMixinTypes(mixinNodeTypes, propName); - } else if (nodeData.isMixReferenceable() && propName.equals(Constants.JCR_UUID)) { newProperty = endUuid(nodeData, propName); - } else { @@ -268,7 +263,6 @@ continue; } throw new RepositoryException("Property definition not found for " + propName.getAsString()); - } pDef = defs.getAnyDefinition(); @@ -281,7 +275,6 @@ if (pDef.getRequiredType() == PropertyType.BINARY) { newProperty = endBinary(propertiesMap, newProperty, propName); - } else { @@ -292,7 +285,6 @@ if ("".equals(propertiesMap.get(propName))) { - // Skip empty non string values if (pType != PropertyType.STRING) {

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1542 - jcr/trunk/packaging/module/src/main/javascript.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-01-22 07:17:25 -0500 (Fri, 22 Jan 2010) New Revision: 1542 Modified: jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js Log: EXOJCR-388 .js file updated Modified: jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js =================================================================== --- jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-01-22 12:07:40 UTC (rev 1541) +++ jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-01-22 12:17:25 UTC (rev 1542) @@ -21,7 +21,7 @@ addDependency(core.component.documents) . addDependency(new Project("jcr", "jcr", "jar", "1.0")). addDependency(new Project("concurrent", "concurrent", "jar", "1.3.4")). - addDependency(new Project("javagroups", "jgroups-all", "jar", "2.5.2")). + addDependency(new Project("javagroups", "jgroups-all", "jar", "2.6.13.GA")). addDependency(new Project("stax", "stax-api", "jar", "1.0")). // addDependency(new Project("stax", "stax", "jar", "1.2.0")). addDependency(new Project("org.apache.ws.commons","ws-commons-util","jar","1.0.1")).

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1541 - core/trunk/packaging/module/src/main/javascript.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-01-22 07:07:40 -0500 (Fri, 22 Jan 2010) New Revision: 1541 Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js Log: EXOJCR-388 .js file updated Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js =================================================================== --- core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2010-01-22 11:45:45 UTC (rev 1540) +++ core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2010-01-22 12:07:40 UTC (rev 1541) @@ -17,16 +17,16 @@ module.component.database = new Project("org.exoplatform.core", "exo.core.component.database", "jar", module.version) . addDependency(new Project("com.experlog", "xapool", "jar", "1.5.0")). - addDependency(new Project("org.hibernate", "hibernate-core", "jar", "3.3.1.GA")). + addDependency(new Project("org.hibernate", "hibernate-core", "jar", "3.3.2.GA")). addDependency(new Project("org.hibernate", "hibernate-annotations", "jar", "3.4.0.GA")). addDependency(new Project("org.hibernate", "hibernate-commons-annotations", "jar", "3.1.0.GA")). addDependency(new Project("org.hibernate", "ejb3-persistence", "jar", "1.0.2.GA")). addDependency(new Project("javassist", "javassist", "jar", "3.4.GA")). addDependency(new Project("xdoclet", "xdoclet-hibernate-module", "jar", "1.2.3")). addDependency(new Project("xdoclet", "xdoclet", "jar", "1.2.3")). - addDependency(new Project("xdoclet", "xdoclet-xdoclet-module", "jar", "1.2")). - addDependency(new Project("xdoclet", "xjavadoc", "jar", "1.0.3")). - addDependency(new Project("commons-collections", "commons-collections", "jar", "3.1")). + addDependency(new Project("xdoclet", "xdoclet-xdoclet-module", "jar", "1.2.3")). + addDependency(new Project("xdoclet", "xjavadoc", "jar", "1.2.3")). + addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2")). addDependency(new Project("c3p0", "c3p0", "jar", "0.9.1.2")). addDependency(new Project("antlr", "antlr", "jar", "2.7.6rc1")). addDependency(new Project("javax.transaction", "jta", "jar", "1.0.1B")).

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1540 - in jcr/trunk/exo.jcr.component.core/src/test: resources/conf/cluster and 1 other directory.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2010-01-22 06:45:45 -0500 (Fri, 22 Jan 2010) New Revision: 1540 Added: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cache/TestCacheReplicationDeadLock.java jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-replication-deadlock.xml Log: Added: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cache/TestCacheReplicationDeadLock.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cache/TestCacheReplicationDeadLock.java (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cache/TestCacheReplicationDeadLock.java 2010-01-22 11:45:45 UTC (rev 1540) @@ -0,0 +1,142 @@ +/* + * 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.cache; + +import junit.framework.TestCase; + +import org.jboss.cache.CacheFactory; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.DefaultCacheFactory; + +import java.io.Serializable; +import java.util.concurrent.CyclicBarrier; + +import javax.transaction.TransactionManager; + +/** + * This test created two caches with replication between them. Then two different thread + * are writing to the same FQN some values. Then they commit transactions (in the same + * time). + * Wait for 20s and you'll get: + * org.jboss.cache.lock.TimeoutException: Unable to acquire lock on Fqn [/fqn] after [20000] milliseconds for requestor + * [GlobalTransaction:<127.0.0.1:9601>:1]! Lock held by [GlobalTransaction:<127.0.0.1:9600>:0] + * + * org.jboss.cache.lock.TimeoutException: Unable to acquire lock on Fqn [/fqn] after [20000] milliseconds for requestor + * [GlobalTransaction:<127.0.0.1:9600>:0]! Lock held by [GlobalTransaction:<127.0.0.1:9601>:1] + * + * @author <a href="mailto:nikolazius@gmail.com">Nikolay Zamosenchuk</a> + * @version $Id: Test.java 34360 2009-07-22 23:58:59Z nzamosenchuk $ + * + */ +public class TestCacheReplicationDeadLock extends TestCase +{ + + int threadCount = 2; + + private final CyclicBarrier barrier = new CyclicBarrier(threadCount); + + private final static String LONG_TEXT = + "Compared to OHV pushrod (or I-Head) " + + "systems with the same number of valves the reciprocating components of " + + "the OHC system are fewer and have a lower total mass. Though the system" + + " that drives the cams may become more complex, most engine manufacturer" + + "s easily accept that added complexity in trade for better engine perfor" + + "mance and greater design flexibility. Another performance advantage is " + + "gained as a result of the better optimized port configurations made pos" + + "sible with overhead camshaft designs. With no intrusive pushrods the ov" + + "erhead camshaft cylinder head design can use straighter ports of more a" + + "dvantageous crossection and length."; + + public void testDeadLock() + { + // create cache + CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>(); + final CacheSPI<Serializable, Object> cache1 = + (CacheSPI<Serializable, Object>)factory.createCache("conf/cluster/test-replication-deadlock.xml", false); + final CacheSPI<Serializable, Object> cache2 = + (CacheSPI<Serializable, Object>)factory.createCache("conf/cluster/test-replication-deadlock.xml", false); + + cache1.create(); + cache2.create(); + + cache1.start(); + cache2.start(); + // create threads + for (int i = 0; i < threadCount; i++) + { + new Thread(new WritingTask(barrier, i, i % 2 == 0 ? cache1 : cache2)).start(); + } + + // wait a minute and tear down + try + { + Thread.sleep(60000); + } + catch (InterruptedException e) + { + e.printStackTrace(); + } + + cache1.stop(); + cache1.destroy(); + cache2.stop(); + cache2.destroy(); + } + + class WritingTask implements Runnable + { + + private CyclicBarrier barrier; + + private int index; + + private CacheSPI<Serializable, Object> cache; + + public WritingTask(CyclicBarrier barrier, int index, CacheSPI<Serializable, Object> cache) + { + super(); + this.barrier = barrier; + this.index = index; + this.cache = cache; + } + + public void run() + { + try + { + while (true) + { + TransactionManager mgr = cache.getTransactionManager(); + mgr.begin(); + cache.put("fqn", "key", LONG_TEXT + index); + // make them save in one moment + barrier.await(); + mgr.commit(); + System.out.print(index + " "); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + } + +} Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cache/TestCacheReplicationDeadLock.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-replication-deadlock.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-replication-deadlock.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-replication-deadlock.xml 2010-01-22 11:45:45 UTC (rev 1540) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1_ws"> +  + <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> +  + <jgroupsConfig> +  + + <TCP bind_addr="127.0.0.1" start_port="9600" loopback="true" + recv_buf_size="20000000" send_buf_size="640000" + discard_incompatible_packets="true" max_bundle_size="64000" + max_bundle_timeout="30" use_incoming_packet_handler="true" + enable_bundling="false" use_send_queues="false" sock_conn_timeout="300" + skip_suspected_members="true" use_concurrent_stack="true" + thread_pool.enabled="true" thread_pool.min_threads="1" + thread_pool.max_threads="25" thread_pool.keep_alive_time="5000" + thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" + thread_pool.rejection_policy="run" oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" + oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="100" + oob_thread_pool.rejection_policy="run" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34521" + bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + + + <MERGE2 max_interval="30000" min_interval="10000" /> + <FD_SOCK /> + <FD max_tries="5" shun="true" timeout="10000" /> + <VERIFY_SUSPECT timeout="1500" /> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" /> + <UNICAST timeout="300,600,1200,2400,3600" /> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" + stability_delay="1000" /> + <pbcast.GMS join_timeout="5000" print_local_addr="true" + shun="false" view_ack_collection_timeout="5000" view_bundling="true" /> + <FRAG2 frag_size="60000" /> + <pbcast.STREAMING_STATE_TRANSFER /> + <pbcast.FLUSH timeout="0" /> + + </jgroupsConfig> + + <sync /> + + </clustering> + +  + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="1000000"> + <property name="maxNodes" value="10000" /> + <property name="timeToLive" value="120000" /> + </default> + </eviction> +</jbosscache> Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-replication-deadlock.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1539 - kernel/trunk/packaging/module/src/main/javascript.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-01-22 06:43:40 -0500 (Fri, 22 Jan 2010) New Revision: 1539 Modified: kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js Log: EXOJCR-388 .js file updated Modified: kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js =================================================================== --- kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2010-01-22 10:07:45 UTC (rev 1538) +++ kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2010-01-22 11:43:40 UTC (rev 1539) @@ -11,7 +11,7 @@ module.commons = new Project("org.exoplatform.kernel", "exo.kernel.commons", "jar", module.version). - addDependency(new Project("commons-lang", "commons-lang", "jar", "2.3")). + addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")). addDependency(new Project("xpp3", "xpp3", "jar", "1.1.3.4.O")). // addDependency(new Project("xstream", "xstream", "jar", "1.2")). addDependency(new Project("dom4j", "dom4j", "jar", "1.6.1")); @@ -21,11 +21,11 @@ addDependency(module.commons). addDependency(new Project("picocontainer", "picocontainer", "jar", "1.1")). // addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", "1.5.6")). - addDependency(new Project("commons-beanutils", "commons-beanutils", "jar", "1.6")). + addDependency(new Project("commons-beanutils", "commons-beanutils", "jar", "1.8")). addDependency(new Project("org.jibx", "jibx-run", "jar", "1.2.1")). addDependency(new Project("org.jibx", "jibx-bind", "jar", "1.2.1")). addDependency(new Project("asm", "asm", "jar", "1.5.3")). - addDependency(new Project("cglib", "cglib", "jar", "2.1_3")); + addDependency(new Project("cglib", "cglib", "jar", "2.2")); module.misc = {} ; module.misc.drools = @@ -39,21 +39,21 @@ module.component = {}; module.component.common = new Project("org.exoplatform.kernel", "exo.kernel.component.common", "jar", module.version). - addDependency(new Project("quartz", "quartz", "jar", "1.5.0-RC2")). + addDependency(new Project("quartz", "quartz", "jar", "1.5.2")). addDependency(new Project("javax.activation", "activation", "jar", "1.1")). - addDependency(new Project("javax.mail", "mail", "jar", "1.4")); + addDependency(new Project("javax.mail", "mail", "jar", "1.4.2")); module.component.command = new Project("org.exoplatform.kernel", "exo.kernel.component.command", "jar", module.version). addDependency(new Project("commons-chain", "commons-chain", "jar", "1.0")). - addDependency(new Project("commons-digester", "commons-digester", "jar", "1.6")); + addDependency(new Project("commons-digester", "commons-digester", "jar", "1.8.1")); module.component.cache = new Project("org.exoplatform.kernel", "exo.kernel.component.cache", "jar", module.version) ; module.component.remote = new Project("org.exoplatform.kernel", "exo.kernel.component.remote", "jar", module.version). - addDependency(new Project("javagroups", "jgroups-all", "jar", "2.5.2")); + addDependency(new Project("javagroups", "jgroups-all", "jar", "2.6.13.GA")); return module; }

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1538 - in jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext: repository and 1 other directory.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2010-01-22 05:07:45 -0500 (Fri, 22 Jan 2010) New Revision: 1538 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java Log: EXOJCR-381 : Add call method RepositoryServiceConfigurationImpl.retain() after cell remove repositoy or workspace in methods RestRepositoyService.removeRepository(UriInfo, String, Boolean) , RestRepositoyService.removeWorkspace(UriInfo, String, String, Boolean), HTTPBackupAgent.dropWorkspace(String, String, Boolean). Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-01-22 09:30:15 UTC (rev 1537) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-01-22 10:07:45 UTC (rev 1538) @@ -366,6 +366,7 @@ RepositoryImpl repositoryImpl = (RepositoryImpl) repositoryService.getRepository(repository); repositoryImpl.removeWorkspace(workspace); + repositoryService.getConfig().retain(); // save configuration to persistence (file or persister) return Response.ok().cacheControl(noCache).build(); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java 2010-01-22 09:30:15 UTC (rev 1537) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java 2010-01-22 10:07:45 UTC (rev 1538) @@ -393,6 +393,7 @@ if (repositoryService.canRemoveRepository(repositoryName)) { repositoryService.removeRepository(repositoryName); + repositoryService.getConfig().retain(); // save configuration to persistence (file or persister) return Response.noContent().build(); } return Response.status(HTTPStatus.CONFLICT).entity("Can't remove repository " + repositoryName).cacheControl( @@ -454,6 +455,7 @@ if (repository.canRemoveWorkspace(workspaceName)) { repository.removeWorkspace(workspaceName); + repositoryService.getConfig().retain(); // save configuration to persistence (file or persister) return Response.noContent().build(); } return Response.status(Status.CONFLICT).entity(

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r1537 - in jcr/trunk/exo.jcr.component.core/src: test/resources/conf/cluster and 1 other directories.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2010-01-22 04:30:15 -0500 (Fri, 22 Jan 2010) New Revision: 1537 Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml Log: EXOJCR-402: Add an EvictionActionPolicy as workaround of https://jira.jboss.org/jira/browse/JBCACHE-1567 Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java 2010-01-22 09:30:15 UTC (rev 1537) @@ -0,0 +1,93 @@ +/* + * 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.impl.dataflow.persistent.jbosscache; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.cache.Cache; +import org.jboss.cache.Fqn; +import org.jboss.cache.eviction.DefaultEvictionActionPolicy; +import org.jboss.cache.eviction.EvictionActionPolicy; + +import java.util.Set; + +/** + * This class is used to prevent the memory leak described here http://community.jboss.org/thread/147084 + * and corresponding to the JIRA https://jira.jboss.org/jira/browse/JBCACHE-1567 + * + * Created by The eXo Platform SAS + * Author : Nicolas Filotto + * nicolas.filotto(a)exoplatform.com + * 22 janv. 2010 + */ +public class ParentNodeEvictionActionPolicy implements EvictionActionPolicy +{ + Cache<?, ?> cache; + + private static final Log log = LogFactory.getLog(DefaultEvictionActionPolicy.class); + + public void setCache(Cache<?, ?> cache) + { + this.cache = cache; + } + + @SuppressWarnings("unchecked") + public boolean evict(Fqn fqn) + { + boolean result; + try + { + if (log.isTraceEnabled()) + log.trace("Evicting Fqn " + fqn); + cache.evict(fqn); + result = true; + } + catch (Exception e) + { + if (log.isDebugEnabled()) + log.debug("Unable to evict " + fqn, e); + result = false; + } + if (fqn.size() != 3) + { + return result; + } + try + { + Fqn parentFqn = fqn.getParent(); + if (parentFqn.get(0).equals(JBossCacheWorkspaceStorageCache.CHILD_NODES) + || parentFqn.get(0).equals(JBossCacheWorkspaceStorageCache.CHILD_PROPS)) + { + // The expected data structure is of type $CHILD_NODES/${node-id}/${sub-node-name} or + // $CHILD_PROPS/${node-id}/${sub-property-name} + Set<Object> names = cache.getChildrenNames(parentFqn); + if (names.isEmpty() || (names.size() == 1 && names.contains(fqn.get(2)))) + { + if (log.isTraceEnabled()) + log.trace("Evicting Fqn " + fqn); + cache.evict(parentFqn); + } + } + } + catch (Exception e) + { + if (log.isDebugEnabled()) + log.debug("Unable to evict " + fqn, e); + } + return result; + } +} Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml 2010-01-22 08:13:52 UTC (rev 1536) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml 2010-01-22 09:30:15 UTC (rev 1537) @@ -80,7 +80,7 @@  <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="1000000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> <property name="maxNodes" value="10000" /> <property name="timeToLive" value="120000" /> </default> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml 2010-01-22 08:13:52 UTC (rev 1536) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml 2010-01-22 09:30:15 UTC (rev 1537) @@ -80,7 +80,7 @@  <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="1000000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> <property name="maxNodes" value="10000" /> <property name="timeToLive" value="120000" /> </default> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-01-22 08:13:52 UTC (rev 1536) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-01-22 09:30:15 UTC (rev 1537) @@ -11,7 +11,7 @@  <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> <property name="maxNodes" value="5000" /> <property name="minTimeToLive" value="60000" /> </default>

14 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits January 2010