exo-jcr SVN: r4097 - kernel/trunk/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-16 07:11:38 -0400 (Wed, 16 Mar 2011)
New Revision: 4097
Modified:
kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js
Log:
EXOJCR-1252: Remove asm dependency from Kernel packaging
Modified: kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js
===================================================================
--- kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-03-15 20:31:31 UTC (rev 4096)
+++ kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-03-16 11:11:38 UTC (rev 4097)
@@ -4,7 +4,7 @@
function getModule(params) {
var module = new Module();
- module.version = "${project.version}" ;//
+ module.version = "${project.version}";
module.relativeMavenRepo = "org/exoplatform/kernel" ;
module.relativeSRCRepo = "kernel" ;
module.name = "kernel" ;
@@ -13,18 +13,15 @@
new Project("org.exoplatform.kernel", "exo.kernel.commons", "jar", module.version).
addDependency(new Project("commons-lang", "commons-lang", "jar", "2.6")).
addDependency(new Project("xpp3", "xpp3", "jar", "1.1.4c")).
-// addDependency(new Project("xstream", "xstream", "jar", "1.2")).
addDependency(new Project("dom4j", "dom4j", "jar", "1.6.1"));
module.container =
new Project("org.exoplatform.kernel", "exo.kernel.container", "jar", module.version).
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.8.3")).
addDependency(new Project("org.jibx", "jibx-run", "jar", "1.2.2")).
addDependency(new Project("org.jibx", "jibx-bind", "jar", "1.2.2")).
- addDependency(new Project("asm", "asm", "jar", "1.5.3")).
addDependency(new Project("cglib", "cglib", "jar", "2.2"));
module.misc = {} ;
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4096 - jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-15 16:31:31 -0400 (Tue, 15 Mar 2011)
New Revision: 4096
Modified:
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-data.xml
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml
Log:
EXOJCR-828: fix configuration
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-data.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-data.xml 2011-03-15 16:13:55 UTC (rev 4095)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-data.xml 2011-03-15 20:31:31 UTC (rev 4096)
@@ -21,8 +21,8 @@
-->
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
- xmlns="urn:infinispan:config:4.0">
+ xsi:schemaLocation="urn:infinispan:config:4.1 http://www.infinispan.org/schemas/infinispan-config-4.1.xsd"
+ xmlns="urn:infinispan:config:4.1">
<global>
<evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
@@ -46,10 +46,9 @@
<sync />
</clustering>
- <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
- <deadlockDetection enabled="true" spinDuration="100"/>
<eviction strategy="LRU" wakeUpInterval="5000" threadPolicy="DEFAULT" maxEntries="1000000"/>
</default>
</infinispan>
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml 2011-03-15 16:13:55 UTC (rev 4095)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml 2011-03-15 20:31:31 UTC (rev 4096)
@@ -21,8 +21,8 @@
-->
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
- xmlns="urn:infinispan:config:4.0">
+ xsi:schemaLocation="urn:infinispan:config:4.1 http://www.infinispan.org/schemas/infinispan-config-4.1.xsd"
+ xmlns="urn:infinispan:config:4.1">
<global>
<evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
@@ -46,10 +46,9 @@
<sync />
</clustering>
- <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
- <deadlockDetection enabled="true" spinDuration="100"/>
<eviction strategy="NONE"/>
<loaders passivation="false" shared="false" preload="false">
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml 2011-03-15 16:13:55 UTC (rev 4095)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml 2011-03-15 20:31:31 UTC (rev 4096)
@@ -21,8 +21,8 @@
-->
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
- xmlns="urn:infinispan:config:4.0">
+ xsi:schemaLocation="urn:infinispan:config:4.1 http://www.infinispan.org/schemas/infinispan-config-4.1.xsd"
+ xmlns="urn:infinispan:config:4.1">
<global>
<evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
@@ -46,10 +46,9 @@
<sync />
</clustering>
- <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
- <deadlockDetection enabled="true" spinDuration="100"/>
<eviction strategy="NONE"/>
<loaders passivation="false" shared="true" preload="true">
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4095 - in jcr/trunk/exo.jcr.component.core/src: test/resources/conf/standalone and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-15 12:13:55 -0400 (Tue, 15 Mar 2011)
New Revision: 4095
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-828: set unique workspace name for regionid instead of its hash
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-15 14:20:35 UTC (rev 4094)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-15 16:13:55 UTC (rev 4095)
@@ -115,8 +115,7 @@
// configure cache loader parameters with correct DB data-types
configureJDBCCacheLoader(config.getLockManager());
- // ISPN adds regionId to table name and therefore for some db table name is too long
- cache = factory.createCache("Lock_" + config.getUniqueName().hashCode(), config.getLockManager());
+ cache = factory.createCache("Lock_" + config.getUniqueName(), config.getLockManager());
// Context recall is a workaround of JDBCCacheLoader starting.
context.recall();
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-03-15 14:20:35 UTC (rev 4094)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-03-15 16:13:55 UTC (rev 4095)
@@ -75,7 +75,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -141,7 +141,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -207,7 +207,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -296,7 +296,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -371,7 +371,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db2_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -435,7 +435,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db2_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -519,7 +519,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -592,7 +592,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -668,7 +668,7 @@
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
<property name="jgroups-configuration" value="flush-udp.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-03-15 14:20:35 UTC (rev 4094)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-03-15 16:13:55 UTC (rev 4095)
@@ -75,7 +75,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -130,7 +130,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -185,7 +185,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -262,7 +262,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -325,7 +325,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db2_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -378,7 +378,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db2_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -451,7 +451,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -512,7 +512,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -576,7 +576,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-03-15 14:20:35 UTC (rev 4094)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-03-15 16:13:55 UTC (rev 4095)
@@ -75,7 +75,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -130,7 +130,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -185,7 +185,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -262,7 +262,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -325,7 +325,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db2_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -378,7 +378,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db2_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -451,7 +451,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -512,7 +512,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
@@ -576,7 +576,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/test-infinispan-lock.xml" />
- <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" />
<property name="infinispan-cl-cache.jdbc.table.create" value="true" />
<property name="infinispan-cl-cache.jdbc.table.drop" value="false" />
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4094 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-15 10:20:35 -0400 (Tue, 15 Mar 2011)
New Revision: 4094
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java
Log:
EXOJCR-834: Reset the manager before storing it into the map since the default config is used as template to define a new configuration which can cause issues if the first cache to register itself is not a JCR cache but a JCR Lock or JCR Indexing because the Cache Loaders will be configured by default
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2011-03-15 13:54:34 UTC (rev 4093)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2011-03-15 14:20:35 UTC (rev 4094)
@@ -164,6 +164,9 @@
}
else
{
+ // Reset the manager before storing it into the map since the default config is used as
+ // template to define a new configuration
+ manager = new DefaultCacheManager(gc);
CACHE_MANAGERS.put(gc, manager);
if (log.isInfoEnabled())
{
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4093 - ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet.
by do-not-reply＠jboss.org
Author: aparfonov
Date: 2011-03-15 09:54:34 -0400 (Tue, 15 Mar 2011)
New Revision: 4093
Modified:
ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
Log:
EXOJCR-1246
Modified: ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
===================================================================
--- ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-03-15 12:28:10 UTC (rev 4092)
+++ ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-03-15 13:54:34 UTC (rev 4093)
@@ -116,6 +116,6 @@
*/
public void contextDestroyed(ServletContextEvent event)
{
- // container.stop();
+ container.stop();
}
}
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4092 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/dataflow/persistent/infinispan and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-15 08:28:10 -0400 (Tue, 15 Mar 2011)
New Revision: 4092
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ItemType.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-828: Manager null items more clearly
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ItemType.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ItemType.java 2011-03-15 11:54:59 UTC (rev 4091)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ItemType.java 2011-03-15 12:28:10 UTC (rev 4092)
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
package org.exoplatform.services.jcr.datamodel;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java 2011-03-15 11:54:59 UTC (rev 4091)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java 2011-03-15 12:28:10 UTC (rev 4092)
@@ -37,37 +37,37 @@
private final String parentId;
+ private final QPathEntry name;
+
private final QPath path;
- public NullItemData(NodeData parentData, QPathEntry name)
+ public NullItemData(NodeData parent, QPathEntry name)
{
- this.parentId = parentData.getIdentifier();
- this.path = QPath.makeChildPath(parentData.getQPath(), name);
+ this.parentId = parent.getIdentifier();
+ this.path = QPath.makeChildPath(parent.getQPath(), name);
+ this.name = name;
this.id = NULL_ID;
}
- /**
- * This constructor must never be used for null nodes placed in cache. Only for returned values.
- *
- * @param parentId
- * @param name
- */
- public NullItemData(String parentId, QPathEntry name)
+ public NullItemData(String id)
{
- this.parentId = parentId;
+ this.parentId = null;
this.path = null;
- this.id = NULL_ID;
+ this.name = null;
+ this.id = id;
}
- public NullItemData(String id)
+ public NullItemData()
{
this.parentId = null;
this.path = null;
- this.id = id;
+ this.name = null;
+ this.id = NULL_ID;
}
public void accept(ItemDataVisitor visitor) throws RepositoryException
{
+ throw new UnsupportedOperationException("Method is not supported");
}
public String getIdentifier()
@@ -82,7 +82,7 @@
public int getPersistedVersion()
{
- return 0;
+ throw new UnsupportedOperationException("Method is not supported");
}
public QPath getQPath()
@@ -90,4 +90,9 @@
return path;
}
+ public QPathEntry getName()
+ {
+ return name;
+ }
+
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java 2011-03-15 11:54:59 UTC (rev 4091)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java 2011-03-15 12:28:10 UTC (rev 4092)
@@ -29,20 +29,10 @@
*/
public class NullNodeData extends NullItemData implements NodeData
{
- public NullNodeData(NodeData parentData, QPathEntry name)
- {
- super(parentData, name);
- }
- /**
- * This constructor must never be used for null nodes placed in cache. Only for returned values.
- *
- * @param parentId
- * @param name
- */
- public NullNodeData(String parentId, QPathEntry name)
+ public NullNodeData(NodeData parent, QPathEntry name)
{
- super(parentId, name);
+ super(parent, name);
}
public NullNodeData(String id)
@@ -50,6 +40,11 @@
super(id);
}
+ public NullNodeData()
+ {
+ super();
+ }
+
/**
* {@inheritDoc}
*/
@@ -63,7 +58,7 @@
*/
public AccessControlList getACL()
{
- return null;
+ throw new UnsupportedOperationException("Method is not supported");
}
/**
@@ -71,7 +66,7 @@
*/
public InternalQName[] getMixinTypeNames()
{
- return null;
+ throw new UnsupportedOperationException("Method is not supported");
}
/**
@@ -79,7 +74,7 @@
*/
public int getOrderNumber()
{
- return 0;
+ throw new UnsupportedOperationException("Method is not supported");
}
/**
@@ -87,7 +82,7 @@
*/
public InternalQName getPrimaryTypeName()
{
- return null;
+ throw new UnsupportedOperationException("Method is not supported");
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java 2011-03-15 11:54:59 UTC (rev 4091)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java 2011-03-15 12:28:10 UTC (rev 4092)
@@ -29,9 +29,9 @@
public class NullPropertyData extends NullItemData implements PropertyData
{
- public NullPropertyData(NodeData parentData, QPathEntry name)
+ public NullPropertyData(NodeData parent, QPathEntry name)
{
- super(parentData, name);
+ super(parent, name);
}
public NullPropertyData(String id)
@@ -39,12 +39,17 @@
super(id);
}
+ public NullPropertyData()
+ {
+ super();
+ }
+
/**
* {@inheritDoc}
*/
public int getType()
{
- return -1;
+ throw new UnsupportedOperationException("Method is not supported");
}
/**
@@ -52,7 +57,7 @@
*/
public List<ValueData> getValues()
{
- return null;
+ throw new UnsupportedOperationException("Method is not supported");
}
/**
@@ -60,7 +65,7 @@
*/
public boolean isMultiValued()
{
- return false;
+ throw new UnsupportedOperationException("Method is not supported");
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-03-15 11:54:59 UTC (rev 4091)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-03-15 12:28:10 UTC (rev 4092)
@@ -487,8 +487,14 @@
{
if (itemId.equals(NullItemData.NULL_ID))
{
- // this NullNodeData object will not be placed at cache, so we can use unsafe constructor
- return new NullNodeData(parentIdentifier, name);
+ if (itemType == ItemType.UNKNOWN || itemType == ItemType.NODE)
+ {
+ return new NullNodeData();
+ }
+ else
+ {
+ return new NullPropertyData();
+ }
}
else
{
@@ -694,9 +700,9 @@
/**
* Internal put NullNode.
*
- * @param node, NodeData, new data to put in the cache
+ * @param item, NullItemData, new data to put in the cache
*/
- protected void putNullItem(NullItemData node)
+ protected void putNullItem(NullItemData item)
{
boolean inTransaction = cache.isTransactionActive();
try
@@ -707,16 +713,14 @@
}
cache.setLocal(true);
- if (node.getQPath() == null)
+ if (!item.getIdentifier().equals(NullItemData.NULL_ID))
{
- //put in $ITEMS
- cache.put(new CacheId(node.getIdentifier()), node);
+ cache.put(new CacheId(item.getIdentifier()), item);
}
- else
+ else if (item.getName() != null && item.getParentIdentifier() != null)
{
-
- cache.put(new CacheQPath(node.getParentIdentifier(), node.getQPath(), (node.isNode() ? ItemType.NODE
- : ItemType.PROPERTY)), node.getIdentifier());
+ cache.put(new CacheQPath(item.getParentIdentifier(), item.getName(), ItemType.getItemType(item)),
+ NullItemData.NULL_ID);
}
}
finally
@@ -875,10 +879,8 @@
{
// check is this descendant of prevRootPath
QPath nodeQPath = data.getQPath();
- // NullNodeData's qPath==null;
if (nodeQPath != null && nodeQPath.isDescendantOf(prevRootPath))
{
-
//make relative path
QPathEntry[] relativePath = null;
try
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-03-15 11:54:59 UTC (rev 4091)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-03-15 12:28:10 UTC (rev 4092)
@@ -32,6 +32,7 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.NullItemData;
import org.exoplatform.services.jcr.datamodel.NullNodeData;
+import org.exoplatform.services.jcr.datamodel.NullPropertyData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
@@ -221,7 +222,7 @@
do
{
String itemId = (String)cache.get(makeChildFqn(root, parentId, (String)childs.next()), ITEM_ID);
- if (itemId != null && !itemId.equals(NullItemData.NULL_ID))
+ if (itemId != null)
{
n = (T)cache.get(makeItemFqn(itemId), ITEM_DATA);
}
@@ -712,8 +713,14 @@
{
if (itemId.equals(NullItemData.NULL_ID))
{
- // this NullNodeData object will not be placed at cache, so we can use unsafe constructor
- return new NullNodeData(parentId, name);
+ if (itemType == ItemType.UNKNOWN || itemType == ItemType.NODE)
+ {
+ return new NullNodeData();
+ }
+ else
+ {
+ return new NullPropertyData();
+ }
}
else
{
@@ -1082,9 +1089,9 @@
/**
* Internal put NullNode.
*
- * @param node, NodeData, new data to put in the cache
+ * @param item, NullItemData, new data to put in the cache
*/
- protected void putNullItem(NullItemData node)
+ protected void putNullItem(NullItemData item)
{
boolean inTransaction = cache.isTransactionActive();
try
@@ -1095,24 +1102,24 @@
}
cache.setLocal(true);
- if (node.getQPath() == null)
+ if (!item.getIdentifier().equals(NullItemData.NULL_ID))
{
//put in $ITEMS
- cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node);
+ cache.put(makeItemFqn(item.getIdentifier()), ITEM_DATA, item);
}
- else
+ else if (item.getName() != null && item.getParentIdentifier() != null)
{
- if (node.isNode())
+ if (item.isNode())
{
// put in $CHILD_NODES
- cache.put(makeChildFqn(childNodes, node.getParentIdentifier(), node.getQPath().getEntries()[node
- .getQPath().getEntries().length - 1]), ITEM_ID, node.getIdentifier());
+ cache.put(makeChildFqn(childNodes, item.getParentIdentifier(), item.getName()), ITEM_ID,
+ NullItemData.NULL_ID);
}
else
{
// put in $CHILD_PROPERTIES
- cache.put(makeChildFqn(childProps, node.getParentIdentifier(), node.getQPath().getEntries()[node
- .getQPath().getEntries().length - 1]), ITEM_ID, node.getIdentifier());
+ cache.put(makeChildFqn(childProps, item.getParentIdentifier(), item.getName()), ITEM_ID,
+ NullItemData.NULL_ID);
}
}
}
@@ -1355,7 +1362,6 @@
// check is this descendant of prevRootPath
QPath nodeQPath = data.getQPath();
- // NullNodeData's qPath==null;
if (nodeQPath != null && nodeQPath.isDescendantOf(prevRootPath))
{
//make relative path
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4091 - core/tags/2.4.0-Beta03/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-15 07:54:59 -0400 (Tue, 15 Mar 2011)
New Revision: 4091
Modified:
core/tags/2.4.0-Beta03/packaging/module/src/main/javascript/core.packaging.module.js
Log:
EXOJCR-1247: Added missing dependencies
Modified: core/tags/2.4.0-Beta03/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/tags/2.4.0-Beta03/packaging/module/src/main/javascript/core.packaging.module.js 2011-03-15 11:51:59 UTC (rev 4090)
+++ core/tags/2.4.0-Beta03/packaging/module/src/main/javascript/core.packaging.module.js 2011-03-15 11:54:59 UTC (rev 4091)
@@ -16,23 +16,15 @@
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.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.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")).
- //addDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10")).
- //addDependency(new Project("jotm", "jotm", "jar", "2.0.10")).
- //addDependency(new Project("howl", "howl-logger", "jar", "0.1.11")).
addDependency(new Project("hsqldb", "hsqldb", "jar", "1.8.0.7")).
addDependency(new Project("javax.resource", "connector-api", "jar", "1.5"));
@@ -47,6 +39,8 @@
addDependency(new Project("org.apache.poi", "poi-scratchpad", "jar", "3.6")).
addDependency(new Project("org.apache.poi", "poi-ooxml", "jar", "3.6")).
addDependency(new Project("org.apache.poi", "poi-ooxml-schemas", "jar", "3.6")).
+ addDependency(new Project("org.apache.tika", "tika-core", "jar", "0.7")).
+ addDependency(new Project("org.apache.tika", "tika-parsers", "jar", "0.7")).
addDependency(new Project("org.apache.xmlbeans", "xmlbeans", "jar", "2.3.0"));
module.component.organization =
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4090 - ws/tags/2.2.0-Beta03/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-15 07:51:59 -0400 (Tue, 15 Mar 2011)
New Revision: 4090
Modified:
ws/tags/2.2.0-Beta03/packaging/module/src/main/javascript/ws.packaging.module.js
Log:
EXOJCR-1247: Fixed the syntax
Modified: ws/tags/2.2.0-Beta03/packaging/module/src/main/javascript/ws.packaging.module.js
===================================================================
--- ws/tags/2.2.0-Beta03/packaging/module/src/main/javascript/ws.packaging.module.js 2011-03-15 11:48:09 UTC (rev 4089)
+++ ws/tags/2.2.0-Beta03/packaging/module/src/main/javascript/ws.packaging.module.js 2011-03-15 11:51:59 UTC (rev 4090)
@@ -4,7 +4,7 @@
function getModule(params) {
var module = new Module();
- module.version = "${project.version}" ;//
+ module.version = "${project.version}";
module.relativeMavenRepo = "org/exoplatform/ws" ;
module.relativeSRCRepo = "ws/trunk" ;
module.name = "ws" ;
@@ -18,8 +18,7 @@
module.frameworks = {};
module.frameworks.servlet =
- new Project("org.exoplatform.ws", "exo.ws.frameworks.servlet", "jar", module.version)
- //.addDependency(new Project("javax.servlet", "servlet-api", "jar", "2.4"));
+ new Project("org.exoplatform.ws", "exo.ws.frameworks.servlet", "jar", module.version);
module.frameworks.json =
new Project("org.exoplatform.ws", "exo.ws.frameworks.json", "jar", module.version);
@@ -39,11 +38,7 @@
addDependency(new Project("javax.annotation", "jsr250-api", "jar", "1.0")).
addDependency(new Project("javax.ws.rs", "jsr311-api", "jar", "1.0")).
addDependency(new Project("commons-chain", "commons-chain", "jar", "1.0")) .
-// addDependency(new Project("javax.xml.parsers", "jaxp-api", "jar", "1.4")) .
- addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1")) .
- //addDependency(new Project("com.sun.xml.bind", "jaxb-impl", "jar", "2.1.7")) .
-// addDependency(new Project("com.sun.xml.parsers", "jaxp-ri", "jar", "1.4")) .
- //addDependency(new Project("org.jvnet.jaxb2.maven2", "maven-jaxb2-plugin", "jar", "0.1"));
+ addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1"));
module.soap = {};
module.soap.jsr181 =
@@ -51,7 +46,6 @@
addDependency(new Project("picocontainer", "picocontainer", "jar", "1.1")) .
addDependency(new Project("org.codehaus.xfire", "xfire-jsr181-api", "jar", "1.0")) .
addDependency(new Project("org.codehaus.xfire", "xfire-all", "jar", "1.2.6")) .
- // addDependency(new Project("stax", "stax-api", "jar", "1.0")) .
addDependency(new Project("wsdl4j", "wsdl4j", "jar", "1.6.1")) .
addDependency(new Project("jdom", "jdom", "jar", "1.0"));
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4089 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock: infinispan and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-15 07:48:09 -0400 (Tue, 15 Mar 2011)
New Revision: 4089
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
Log:
EXOJCR-834: perform lock operation out of transaction
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-03-15 10:05:20 UTC (rev 4088)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-03-15 11:48:09 UTC (rev 4089)
@@ -52,6 +52,9 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.security.IdentityConstants;
+import org.jboss.cache.Cache;
+import org.jboss.cache.Node;
+import org.jboss.cache.loader.CacheLoader;
import org.picocontainer.Startable;
import java.io.BufferedOutputStream;
@@ -72,6 +75,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.lock.LockException;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
/**
@@ -128,8 +132,22 @@
/**
* Logger
*/
- private final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.AbstractCacheableLockManager");
+ protected Log LOG = ExoLogger.getLogger("exo.jcr.component.core.AbstractCacheableLockManager");
+ protected LockActionNonTxAware<Integer, Object> getNumLocks;
+
+ protected LockActionNonTxAware<Boolean, Object> hasLocks;
+
+ protected LockActionNonTxAware<Boolean, String> isLockLive;
+
+ protected LockActionNonTxAware<Object, LockData> refresh;
+
+ protected LockActionNonTxAware<Boolean, String> lockExist;
+
+ protected LockActionNonTxAware<LockData, String> getLockDataById;
+
+ protected LockActionNonTxAware<List<LockData>, Object> getLockList;
+
/**
* Constructor.
*
@@ -170,7 +188,113 @@
dataManager.addItemPersistenceListener(this);
}
+ /**
+ * Returns the number of active locks.
+ */
@Managed
+ @ManagedDescription("The number of active locks")
+ public int getNumLocks()
+ {
+ try
+ {
+ return executeLockActionNonTxAware(getNumLocks, null);
+ }
+ catch (LockException e)
+ {
+ // ignore me will never occur
+ }
+ return -1;
+ }
+
+ /**
+ * Indicates if some locks have already been created.
+ */
+ protected boolean hasLocks()
+ {
+ try
+ {
+ return executeLockActionNonTxAware(hasLocks, null);
+ }
+ catch (LockException e)
+ {
+ // ignore me will never occur
+ }
+ return true;
+ }
+
+ /**
+ * Check is LockManager contains lock. No matter it is in pending or persistent state.
+ */
+ public boolean isLockLive(String nodeId) throws LockException
+ {
+ try
+ {
+ return executeLockActionNonTxAware(isLockLive, nodeId);
+ }
+ catch (LockException e)
+ {
+ // ignore me will never occur
+ }
+ return false;
+ }
+
+ /**
+ * Refreshed lock data in cache
+ */
+ public void refreshLockData(LockData newLockData) throws LockException
+ {
+ executeLockActionNonTxAware(refresh, newLockData);
+ }
+
+ /**
+ * Check is LockManager contains lock.
+ */
+ public boolean lockExist(String nodeId)
+ {
+ try
+ {
+ return executeLockActionNonTxAware(lockExist, nodeId);
+ }
+ catch (LockException e)
+ {
+ // ignore me will never occur
+ }
+ return false;
+ }
+
+ /**
+ * Returns lock data by node identifier.
+ */
+ protected LockData getLockDataById(String nodeId)
+ {
+ try
+ {
+ return executeLockActionNonTxAware(getLockDataById, nodeId);
+ }
+ catch (LockException e)
+ {
+ // ignore me will never occur
+ }
+ return null;
+ }
+
+ /**
+ * Returns all locks.
+ */
+ protected synchronized List<LockData> getLockList()
+ {
+ try
+ {
+ return executeLockActionNonTxAware(getLockList, null);
+ }
+ catch (LockException e)
+ {
+ // ignore me will never occur
+ }
+ return null;
+ }
+
+ @Managed
@ManagedDescription("Remove the expired locks")
public void cleanExpiredLocks()
{
@@ -631,7 +755,58 @@
sessionLockManagers.remove(sessionID);
}
+ /**
+ * Execute the given action outside a transaction. This is needed since the {@link Cache} used by implementation of {@link CacheableLockManager}
+ * to manage the persistence of its locks thanks to a {@link CacheLoader} and a {@link CacheLoader} lock the cache {@link Node}
+ * even for read operations which cause deadlock issue when a XA {@link Transaction} is already opened
+ * @throws LockException when a exception occurs
+ */
+ private <R, A> R executeLockActionNonTxAware(LockActionNonTxAware<R, A> action, A arg) throws LockException
+ {
+ Transaction tx = null;
+ try
+ {
+ if (tm != null)
+ {
+ try
+ {
+ tx = tm.suspend();
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot suspend the current transaction", e);
+ }
+ }
+ return action.execute(arg);
+ }
+ finally
+ {
+ if (tx != null)
+ {
+ try
+ {
+ tm.resume(tx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot resume the current transaction", e);
+ }
+ }
+ }
+ }
+ /**
+ * Actions that are not supposed to be called within a transaction
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 21 janv. 2010
+ */
+ protected static interface LockActionNonTxAware<R, A>
+ {
+ R execute(A arg) throws LockException;
+ }
/**
* {@inheritDoc}
@@ -802,43 +977,6 @@
}
/**
- * Returns the number of active locks.
- */
- @Managed
- @ManagedDescription("The number of active locks")
- public abstract int getNumLocks();
-
- /**
- * Indicates if some locks have already been created.
- */
- protected abstract boolean hasLocks();
-
- /**
- * Check is LockManager contains lock. No matter it is in pending or persistent state.
- */
- public abstract boolean isLockLive(String nodeId) throws LockException;
-
- /**
- * Refreshed lock data in cache
- */
- public abstract void refreshLockData(LockData newLockData) throws LockException;
-
- /**
- * Check is LockManager contains lock.
- */
- public abstract boolean lockExist(String nodeId);
-
- /**
- * Returns lock data by node identifier.
- */
- protected abstract LockData getLockDataById(String nodeId);
-
- /**
- * Returns all locks.
- */
- protected abstract List<LockData> getLockList();
-
- /**
* Puts lock data directly into cache.
*
* @param lockData
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-15 10:05:20 UTC (rev 4088)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-15 11:48:09 UTC (rev 4089)
@@ -125,84 +125,78 @@
{
throw new RepositoryConfigurationException("Cache configuration not found");
}
- }
- /**
- * {@inheritDoc}
- */
- @Override
- public int getNumLocks()
- {
- return cache.size();
- }
+ this.getNumLocks = new LockActionNonTxAware<Integer, Object>()
+ {
+ public Integer execute(Object arg)
+ {
+ return cache.size();
+ }
+ };
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isLockLive(String nodeId) throws LockException
- {
- return cache.containsKey(nodeId);
- }
+ this.hasLocks = new LockActionNonTxAware<Boolean, Object>()
+ {
+ public Boolean execute(Object arg)
+ {
+ return !cache.isEmpty();
+ }
+ };
- /**
- * {@inheritDoc}
- */
- @Override
- protected LockData getLockDataById(String nodeId)
- {
- return (LockData)cache.get(nodeId);
- }
+ this.isLockLive = new LockActionNonTxAware<Boolean, String>()
+ {
+ public Boolean execute(String nodeId)
+ {
+ return cache.containsKey(nodeId);
+ }
+ };
- /**
- * {@inheritDoc}
- */
- @Override
- protected synchronized List<LockData> getLockList()
- {
- Collection<Object> datas = cache.values();
+ this.refresh = new LockActionNonTxAware<Object, LockData>()
+ {
+ public Object execute(LockData newLockData) throws LockException
+ {
+ Object oldValue = PrivilegedISPNCacheHelper.put(cache, newLockData.getNodeIdentifier(), newLockData);
+ if (oldValue == null)
+ {
+ throw new LockException("Can't refresh lock for node " + newLockData.getNodeIdentifier()
+ + " since lock is not exist");
+ }
+ return null;
+ }
+ };
- List<LockData> locksData = new ArrayList<LockData>();
- for (Object lockData : datas)
+ this.lockExist = new LockActionNonTxAware<Boolean, String>()
{
- if (lockData != null)
+ public Boolean execute(String nodeId) throws LockException
{
- locksData.add((LockData)lockData);
+ return cache.containsKey(nodeId);
}
- }
- return locksData;
- }
+ };
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean lockExist(String nodeId)
- {
- return cache.containsKey(nodeId);
- }
+ this.getLockDataById = new LockActionNonTxAware<LockData, String>()
+ {
+ public LockData execute(String nodeId) throws LockException
+ {
+ return (LockData)cache.get(nodeId);
+ }
+ };
- /**
- * {@inheritDoc}
- */
- @Override
- public void refreshLockData(LockData newLockData) throws LockException
- {
- Object oldValue = PrivilegedISPNCacheHelper.put(cache, newLockData.getNodeIdentifier(), newLockData);
- if (oldValue == null)
+ this.getLockList = new LockActionNonTxAware<List<LockData>, Object>()
{
- throw new LockException("Can't refresh lock for node " + newLockData.getNodeIdentifier()
- + " since lock is not exist");
- }
- }
+ public List<LockData> execute(Object arg) throws LockException
+ {
+ Collection<Object> datas = cache.values();
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean hasLocks()
- {
- return !cache.isEmpty();
+ List<LockData> locksData = new ArrayList<LockData>();
+ for (Object lockData : datas)
+ {
+ if (lockData != null)
+ {
+ locksData.add((LockData)lockData);
+ }
+ }
+ return locksData;
+ }
+ };
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2011-03-15 10:05:20 UTC (rev 4088)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2011-03-15 11:48:09 UTC (rev 4089)
@@ -25,7 +25,6 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.impl.core.lock.LockRemoverHolder;
import org.exoplatform.services.jcr.impl.core.lock.cacheable.AbstractCacheableLockManager;
-import org.exoplatform.services.jcr.impl.core.lock.cacheable.CacheableLockManager;
import org.exoplatform.services.jcr.impl.core.lock.cacheable.CacheableSessionLockManager;
import org.exoplatform.services.jcr.impl.core.lock.cacheable.LockData;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
@@ -63,7 +62,6 @@
import javax.jcr.lock.LockException;
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
/**
@@ -117,20 +115,6 @@
private final boolean shareable;
- private final LockActionNonTxAware<Integer, Object> getNumLocks;
-
- private final LockActionNonTxAware<Boolean, Object> hasLocks;
-
- private final LockActionNonTxAware<Boolean, String> isLockLive;
-
- private final LockActionNonTxAware<Object, LockData> refresh;
-
- private final LockActionNonTxAware<Boolean, String> lockExist;
-
- private final LockActionNonTxAware<LockData, String> getLockDataById;
-
- private final LockActionNonTxAware<List<LockData>, Object> getLockList;
-
/**
* Constructor.
*
@@ -297,118 +281,8 @@
};
}
- /**
- * {@inheritDoc}
- */
- @Override
- public int getNumLocks()
- {
- try
- {
- return executeLockActionNonTxAware(getNumLocks, null);
- }
- catch (LockException e)
- {
- // ignore me will never occur
- }
- return -1;
- }
/**
- * {@inheritDoc}
- */
- @Override
- protected boolean hasLocks()
- {
- try
- {
- return executeLockActionNonTxAware(hasLocks, null);
- }
- catch (LockException e)
- {
- // ignore me will never occur
- }
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isLockLive(String nodeId) throws LockException
- {
- try
- {
- return executeLockActionNonTxAware(isLockLive, nodeId);
- }
- catch (LockException e)
- {
- // ignore me will never occur
- }
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void refreshLockData(LockData newLockData) throws LockException
- {
- executeLockActionNonTxAware(refresh, newLockData);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean lockExist(String nodeId)
- {
- try
- {
- return executeLockActionNonTxAware(lockExist, nodeId);
- }
- catch (LockException e)
- {
- // ignore me will never occur
- }
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected LockData getLockDataById(String nodeId)
- {
- try
- {
- return executeLockActionNonTxAware(getLockDataById, nodeId);
- }
- catch (LockException e)
- {
- // ignore me will never occur
- }
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected synchronized List<LockData> getLockList()
- {
- try
- {
- return executeLockActionNonTxAware(getLockList, null);
- }
- catch (LockException e)
- {
- // ignore me will never occur
- }
- return null;
- }
-
- /**
* If JDBC cache loader is used, then fills-in column types. If column type configured from jcr-configuration file,
* then nothing is overridden. Parameters are injected into the given parameterEntry.
*/
@@ -699,59 +573,6 @@
}
/**
- * Execute the given action outside a transaction. This is needed since the {@link Cache} used by implementation of {@link CacheableLockManager}
- * to manage the persistence of its locks thanks to a {@link CacheLoader} and a {@link CacheLoader} lock the cache {@link Node}
- * even for read operations which cause deadlock issue when a XA {@link Transaction} is already opened
- * @throws LockException when a exception occurs
- */
- private <R, A> R executeLockActionNonTxAware(LockActionNonTxAware<R, A> action, A arg) throws LockException
- {
- Transaction tx = null;
- try
- {
- if (tm != null)
- {
- try
- {
- tx = tm.suspend();
- }
- catch (Exception e)
- {
- LOG.warn("Cannot suspend the current transaction", e);
- }
- }
- return action.execute(arg);
- }
- finally
- {
- if (tx != null)
- {
- try
- {
- tm.resume(tx);
- }
- catch (Exception e)
- {
- LOG.warn("Cannot resume the current transaction", e);
- }
- }
- }
- }
-
- /**
- * Actions that are not supposed to be called within a transaction
- *
- * Created by The eXo Platform SAS
- * Author : Nicolas Filotto
- * nicolas.filotto(a)exoplatform.com
- * 21 janv. 2010
- */
- protected static interface LockActionNonTxAware<R, A>
- {
- R execute(A arg) throws LockException;
- }
-
- /**
* {@inheritDoc}
*/
@Override
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4088 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone: cluster and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-03-15 06:05:20 -0400 (Tue, 15 Mar 2011)
New Revision: 4088
Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-config.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
Log:
EXOJCR-834 : Making commit and rollback synchronous.
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml 2011-03-15 09:05:44 UTC (rev 4087)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml 2011-03-15 10:05:20 UTC (rev 4088)
@@ -47,7 +47,7 @@
</clustering>
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
<eviction strategy="LRU" wakeUpInterval="5000" threadPolicy="DEFAULT" maxEntries="1000000"/>
</default>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml 2011-03-15 09:05:44 UTC (rev 4087)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml 2011-03-15 10:05:20 UTC (rev 4088)
@@ -47,7 +47,7 @@
</clustering>
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
<eviction strategy="NONE"/>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml 2011-03-15 09:05:44 UTC (rev 4087)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml 2011-03-15 10:05:20 UTC (rev 4088)
@@ -47,7 +47,7 @@
</clustering>
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
<eviction strategy="NONE"/>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-config.xml 2011-03-15 09:05:44 UTC (rev 4087)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-config.xml 2011-03-15 10:05:20 UTC (rev 4088)
@@ -36,7 +36,7 @@
<default>
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
<eviction strategy="LRU" wakeUpInterval="5000" threadPolicy="DEFAULT" maxEntries="1000000"/>
</default>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml 2011-03-15 09:05:44 UTC (rev 4087)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml 2011-03-15 10:05:20 UTC (rev 4088)
@@ -38,7 +38,7 @@
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
<jmxStatistics enabled="true"/>
<eviction strategy="NONE"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<loaders passivation="false" shared="false" preload="false">
<loader class="${infinispan-cachestore-classname}" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2011-03-15 09:05:44 UTC (rev 4087)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2011-03-15 10:05:20 UTC (rev 4088)
@@ -36,7 +36,7 @@
<default>
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/>
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
<eviction strategy="NONE"/>
15 years, 1 month
- 1
- 0