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

exo-jcr SVN: r1435 - jcr/branches/1.12.0-JBCCACHE and 1 other directories.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-16 09:49:12 -0500 (Sat, 16 Jan 2010) New Revision: 1435 Modified: core/trunk/pom.xml jcr/branches/1.12.0-JBCCACHE/pom.xml ws/trunk/pom.xml Log: EXOJCR-399 core and ws trunks and 1.12.0-JCRCACHE dependencies on CF trunks Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-01-16 14:33:13 UTC (rev 1434) +++ core/trunk/pom.xml 2010-01-16 14:49:12 UTC (rev 1435) @@ -38,7 +38,7 @@ <exo.product.name>exo-core</exo.product.name> <exo.product.specification>2.3</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta05</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.0-Beta06-SNAPSHOT</org.exoplatform.kernel.version> <exo.test.includes>*Test*</exo.test.includes> </properties> Modified: jcr/branches/1.12.0-JBCCACHE/pom.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/pom.xml 2010-01-16 14:33:13 UTC (rev 1434) +++ jcr/branches/1.12.0-JBCCACHE/pom.xml 2010-01-16 14:49:12 UTC (rev 1435) @@ -38,9 +38,9 @@ <properties> <exo.product.name>exo-jcr</exo.product.name> <exo.product.specification>1.12</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta05</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta05</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.0-Beta05</org.exoplatform.ws.version> + <org.exoplatform.kernel.version>2.2.0-Beta06-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta06-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.0-Beta06-SNAPSHOT</org.exoplatform.ws.version> </properties> <scm> Modified: ws/trunk/pom.xml =================================================================== --- ws/trunk/pom.xml 2010-01-16 14:33:13 UTC (rev 1434) +++ ws/trunk/pom.xml 2010-01-16 14:49:12 UTC (rev 1435) @@ -45,8 +45,8 @@ <exo.product.name>exo-ws</exo.product.name> <exo.product.specification>2.1</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta05</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta05</org.exoplatform.core.version> + <org.exoplatform.kernel.version>2.2.0-Beta06-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta06-SNAPSHOT</org.exoplatform.core.version> <exo.test.includes>*Test*</exo.test.includes> </properties>

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1434 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf: standalone and 1 other directory.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2010-01-16 09:33:13 -0500 (Sat, 16 Jan 2010) New Revision: 1434 Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jcr-config.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-406 : The config to CacheableLockManager was adde to cluster configuraation. Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml (rev 0) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -0,0 +1,71 @@ +<?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="3600000"/> + + <clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_db1_ws"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> + <jgroupsConfig> + + <TCP bind_addr="127.0.0.1" start_port="9700" 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="34530" + 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> + +  + +</jbosscache> Property changes on: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml (rev 0) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -0,0 +1,71 @@ +<?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="3600000"/> + + <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_db1_ws1"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> + <jgroupsConfig> + + <TCP bind_addr="127.0.0.1" start_port="9750" 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="34532" + 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> + +  + +</jbosscache> Property changes on: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jcr-config.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jcr-config.xml 2010-01-16 13:50:31 UTC (rev 1433) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jcr-config.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -78,13 +78,11 @@ <property name="changesfilter-config-path" value="conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml" /> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="target/temp/lock" /> - </properties> - </persister> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/cluster/test-jbosscache-lockconfig_db1_ws.xml" /> + </properties> </lock-manager> </workspace> @@ -121,6 +119,12 @@ <property name="changesfilter-config-path" value="conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml" /> </properties> </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/cluster/test-jbosscache-lockconfig_db1_ws1.xml" /> + </properties> + </lock-manager> </workspace> </workspaces> </repository> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml 2010-01-16 13:50:31 UTC (rev 1433) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -10,7 +10,7 @@ <properties> cache.jdbc.table.name=jdbcjcr cache.jdbc.table.create=true - cache.jdbc.table.drop=true + cache.jdbc.table.drop=false cache.jdbc.table.primarykey=exojcr_pk cache.jdbc.fqn.column=fqn cache.jdbc.fqn.type=VARCHAR(512) @@ -18,11 +18,12 @@ cache.jdbc.node.type=VARBINARY(65535) cache.jdbc.parent.column=parent cache.jdbc.driver=org.hsqldb.jdbcDriver - cache.jdbc.url="jdbc:hsqldb:file:target/temp/data/exojcr + cache.jdbc.url=jdbc:hsqldb:file:target/temp/data/exojcr cache.jdbc.user=sa cache.jdbc.password= </properties> </loader> + </loaders --> </jbosscache> Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml (rev 0) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -0,0 +1,29 @@ +<?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="3600000"/> + + <loaders passivation="false" shared="false"> + + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" + ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jdbcjcr_db1_ws + cache.jdbc.table.create=true + cache.jdbc.table.drop=false + cache.jdbc.table.primarykey=exojcr_pk + cache.jdbc.fqn.column=fqn + cache.jdbc.fqn.type=VARCHAR(512) + cache.jdbc.node.column=node + cache.jdbc.node.type=VARBINARY(65535) + cache.jdbc.parent.column=parent + cache.jdbc.driver=org.hsqldb.jdbcDriver + cache.jdbc.url=jdbc:hsqldb:file:target/temp/data/exojcr + cache.jdbc.user=sa + cache.jdbc.password= + </properties> + </loader> + + </loaders> + +</jbosscache> Property changes on: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml (rev 0) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -0,0 +1,29 @@ +<?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="3600000"/> + + <loaders passivation="false" shared="false"> + + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" + ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jdbcjcr_db1_ws1 + cache.jdbc.table.create=true + cache.jdbc.table.drop=false + cache.jdbc.table.primarykey=exojcr_pk + cache.jdbc.fqn.column=fqn + cache.jdbc.fqn.type=VARCHAR(512) + cache.jdbc.node.column=node + cache.jdbc.node.type=VARBINARY(65535) + cache.jdbc.parent.column=parent + cache.jdbc.driver=org.hsqldb.jdbcDriver + cache.jdbc.url=jdbc:hsqldb:file:target/temp/data/exojcr + cache.jdbc.user=sa + cache.jdbc.password= + </properties> + </loader> + + </loaders> + +</jbosscache> Property changes on: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-01-16 13:50:31 UTC (rev 1433) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-01-16 14:33:13 UTC (rev 1434) @@ -82,7 +82,7 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig_db1_ws.xml" /> </properties> </lock-manager> </workspace> @@ -127,7 +127,7 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml" /> </properties> </lock-manager> </workspace>

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1433 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/api/xa and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-01-16 08:50:31 -0500 (Sat, 16 Jan 2010) New Revision: 1433 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java Log: EXOJCR-405: add XASession to txResourceManager on enlistResource() method Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2010-01-16 12:06:01 UTC (rev 1432) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2010-01-16 13:50:31 UTC (rev 1433) @@ -117,6 +117,7 @@ { if (LOG.isDebugEnabled()) LOG.debug("Delist session: " + getSessionInfo() + ", " + this); + txResourceManager.remove(this); tService.delistResource(this); } catch (RollbackException e) @@ -138,6 +139,7 @@ { if (LOG.isDebugEnabled()) LOG.debug("Enlist session: " + getSessionInfo() + ", " + this); + txResourceManager.add(this); tService.enlistResource(this); } catch (RollbackException e) Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java 2010-01-16 12:06:01 UTC (rev 1432) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java 2010-01-16 13:50:31 UTC (rev 1433) @@ -191,17 +191,19 @@ Object obj = ctx.lookup("UserTransaction"); UserTransaction ut = (UserTransaction)obj; + ut.begin(); + Session s1 = repository.login(new SimpleCredentials("admin", "admin".toCharArray()), session.getWorkspace().getName()); - ut.begin(); Node tx2 = s1.getRootNode().addNode("txcommit2"); ut.commit(); + ut.begin(); + // In a case of reusing Have to enlist the resource once again! ((XASession)s1).enlistResource(); - ut.begin(); tx2.addNode("txcommit21"); s1.save(); ut.commit();

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1432 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-01-16 07:06:01 -0500 (Sat, 16 Jan 2010) New Revision: 1432 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQuery.java Log: EXOJCR-331 : test update Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQuery.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQuery.java 2010-01-16 11:17:40 UTC (rev 1431) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQuery.java 2010-01-16 12:06:01 UTC (rev 1432) @@ -18,12 +18,12 @@ */ package org.exoplatform.services.jcr.lab.cluster.test; -import junit.framework.AssertionFailedError; - import org.exoplatform.services.jcr.JcrAPIBaseTest; import org.exoplatform.services.jcr.core.CredentialsImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; import org.exoplatform.services.jcr.lab.cluster.prepare.TestLoadIndexerWriter; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.util.Random; @@ -41,10 +41,13 @@ */ public class TestLoadIndexerQuery extends JcrAPIBaseTest { + + private Log log = ExoLogger.getLogger(TestLoadIndexerQuery.class); + private boolean stop = false; - - private int threadCount = 1; + private int threadCount = 20; + public void testQuery() throws RepositoryException { log.info("Creating threads..."); @@ -58,7 +61,7 @@ // wait 4 minutes try { - Thread.sleep(60000 * 4); + Thread.sleep(60000 * 4000); } catch (InterruptedException e) { @@ -99,6 +102,7 @@ if (threadNode != null) { Node statisticNode = threadNode.getNode(TestLoadIndexerWriter.STATISTIC); + Node contentNode = threadNode.getNode(TestLoadIndexerWriter.CONTENT); Node wordNode = getRandomChild(statisticNode, "*"); if (wordNode != null) { @@ -112,21 +116,15 @@ catch (InterruptedException e1) { } - + QueryManager qman = sessionLocal.getWorkspace().getQueryManager(); - Query q = qman.createQuery("SELECT * FROM nt:base WHERE fn:name() = '" + word + "'", Query.SQL); + Query q = + qman.createQuery("SELECT * FROM nt:base WHERE jcr:path LIKE '" + contentNode.getPath() + + "/%' and fn:name() = '" + word + "'", Query.SQL); QueryResult res = q.execute(); long sqlsize = res.getNodes().getSize(); - try - { - assertTrue("Exp: "+count+"\t found:"+sqlsize, sqlsize >= count); - System.out.println("+("+sqlsize+")"); - } - catch (AssertionFailedError e) - { - System.out.println("-"+e.getMessage()); - } + log.info("Exp: " + count + "\t found:" + sqlsize); } } } @@ -136,6 +134,11 @@ { log.error(e); } + catch (Exception e) + { + log.error(e); + } + } private Node getRandomChild(Node parent, String pattern) throws RepositoryException

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1431 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2010-01-16 06:17:40 -0500 (Sat, 16 Jan 2010) New Revision: 1431 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java Log: EXOJCR-405 : Import was fixed in CacheableWorkspaceDataManager. Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-16 11:04:13 UTC (rev 1430) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-16 11:17:40 UTC (rev 1431) @@ -34,14 +34,15 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicReference; import javax.jcr.InvalidItemStateException; import javax.jcr.ItemExistsException; import javax.jcr.RepositoryException; +import javax.transaction.InvalidTransactionException; import javax.transaction.RollbackException; import javax.transaction.Status; import javax.transaction.SystemException; +import javax.transaction.Transaction; import javax.transaction.TransactionManager; /**

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1430 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-16 06:04:13 -0500 (Sat, 16 Jan 2010) New Revision: 1430 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml Log: EXOJCR-333 transaction timeout 300 (default for JBossTS) Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-16 11:00:14 UTC (rev 1429) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-16 11:04:13 UTC (rev 1430) @@ -206,7 +206,7 @@ <init-params> <value-param> <name>timeout</name> - <value>20</value> + <value>300</value> </value-param> </init-params> </component> @@ -220,7 +220,7 @@ <value>5</value> </value-param> </init-params> - </component--> + </component --> <external-component-plugins> <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1429 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-16 06:00:14 -0500 (Sat, 16 Jan 2010) New Revision: 1429 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java Log: EXOJCR-333 transaction manager cleanup Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-01-16 10:59:13 UTC (rev 1428) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-01-16 11:00:14 UTC (rev 1429) @@ -129,11 +129,6 @@ protected final Fqn<String> refsRoot; /** - * TransactionManager. - */ - private TransactionManager transactionManager; - - /** * Node order comparator for getChildNodes(). */ class NodesOrderComparator<N extends NodeData> implements Comparator<NodeData> @@ -298,9 +293,6 @@ this.cache.create(); this.cache.start(); - // JTA transaction manager - this.transactionManager = transactionManager != null ? transactionManager : cache.getTransactionManager(); - this.itemsRoot = Fqn.fromElements(ITEMS); this.childNodes = Fqn.fromElements(CHILD_NODES); this.childProps = Fqn.fromElements(CHILD_PROPS); @@ -314,9 +306,11 @@ protected void prepareCache() throws RepositoryException { + + TransactionManager txm = cache.getTransactionManager(); try { - transactionManager.begin(); + txm.begin(); Node<Serializable, Object> cacheRoot = cache.getRoot(); @@ -327,7 +321,7 @@ cacheRoot.addChild(this.childPropsList).setResident(true); cacheRoot.addChild(refsRoot).setResident(true); - transactionManager.commit(); + txm.commit(); } catch (RollbackException e) { @@ -338,7 +332,7 @@ { try { - transactionManager.rollback(); + txm.rollback(); throw new RepositoryException("Cannot preare cache", e); } catch (Exception e1) @@ -362,9 +356,14 @@ } } + /** + * Return TransactionManager used by JBossCache backing the JCR cache. + * + * @return TransactionManager + */ public TransactionManager getTransactionManager() { - return transactionManager; + return cache.getTransactionManager(); } /** @@ -582,17 +581,17 @@ { for (Object child : set) { - PropertyData node = (PropertyData)cache.get(makeItemFqn((String)child), ITEM_DATA); - if (node == null) + PropertyData prop = (PropertyData)cache.get(makeItemFqn((String)child), ITEM_DATA); + if (prop == null) { return null; } - if (withValue && node.getValues().size() <= 0) + if (withValue && prop.getValues().size() <= 0) { // don't return list of empty-valued props (but listChildProperties() can) return null; } - childs.add(node); + childs.add(prop); } return childs; }

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1428 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-16 05:59:13 -0500 (Sat, 16 Jan 2010) New Revision: 1428 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java Log: EXOJCR-405 use transaction suspend/resume for JCR storage dedicated XA commit Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-16 10:34:39 UTC (rev 1427) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-16 10:59:13 UTC (rev 1428) @@ -406,86 +406,132 @@ { super.save(changesLog); - // notify listeners after transaction commit - notifySaveItems(changesLog, false); + // notify listeners after storage commit + notifySaveItems(changesLog, false); } else { try { - if (transactionManager.getStatus() == Status.STATUS_COMMITTING) + // Care about dedicated XA transaction for storage save: + // suspend current ransaction and create one new for the JCR storage (cache etc.) + // after the new transaction done we'll resume the current. + Transaction current = transactionManager.suspend(); + try { - // The JCR session has been enrolled into a XA Transaction, the method applyChanges must be called in another thread since the operations - // that we do into the cache are not allowed within the current Transaction, so to do it in another Transaction we need to call the method - // from another Thread - final AtomicReference<Exception> exception = new AtomicReference<Exception>(); - final CountDownLatch doneSignal = new CountDownLatch(1); - Thread t = new Thread() + saveInTransaction(changesLog); + + // notify listeners after transaction commit but before the current resume! + try { - public void run() + notifySaveItems(changesLog, false); + } + catch (Throwable th) + { + // TODO XA layer can throws runtime exceptions + throw new RepositoryException(th); + } + } + finally + { + if (current != null) + { + try { - try - { - applyChanges(changesLog); - } - catch (Exception e) - { - exception.set(e); - } - finally - { - doneSignal.countDown(); - } + transactionManager.resume(current); } - }; - t.start(); - doneSignal.await(); - Exception e = exception.get(); - if (e != null) - { - if (e instanceof RepositoryException) + catch (InvalidTransactionException e) { - throw (RepositoryException)e; + throw new RepositoryException(e); } - else + catch (IllegalStateException e) { - throw new RuntimeException(e); + throw new RepositoryException(e); } } } - else - { - // Normal Transaction - applyChanges(changesLog); - } } - catch (RepositoryException e) - { - throw e; - } - catch (InterruptedException e) - { - throw new RepositoryException(e.getLocalizedMessage(), e.getCause()); - } catch (SystemException e) { - throw new RepositoryException(e.getLocalizedMessage(), e.getCause()); + throw new RepositoryException(e); } + + // TODO to do not commit in curr thread (i.e. curr tx) + // try + // { + // if (transactionManager.getStatus() == Status.STATUS_COMMITTING) + // { + // // The JCR session has been enrolled into a XA Transaction, the method applyChanges must be called in another thread since the operations + // // that we do into the cache are not allowed within the current Transaction, so to do it in another Transaction we need to call the method + // // from another Thread + // final AtomicReference<Exception> exception = new AtomicReference<Exception>(); + // final CountDownLatch doneSignal = new CountDownLatch(1); + // Thread t = new Thread() + // { + // public void run() + // { + // try + // { + // applyChanges(changesLog); + // } + // catch (Exception e) + // { + // exception.set(e); + // } + // finally + // { + // doneSignal.countDown(); + // } + // } + // }; + // t.start(); + // doneSignal.await(); + // Exception e = exception.get(); + // if (e != null) + // { + // if (e instanceof RepositoryException) + // { + // throw (RepositoryException)e; + // } + // else + // { + // throw new RuntimeException(e); + // } + // } + // } + // else + // { + // // Normal Transaction + // applyChanges(changesLog); + // } + // } + // catch (RepositoryException e) + // { + // throw e; + // } + // catch (InterruptedException e) + // { + // throw new RepositoryException(e.getLocalizedMessage(), e.getCause()); + // } + // catch (SystemException e) + // { + // throw new RepositoryException(e.getLocalizedMessage(), e.getCause()); + // } } - } + } /** - * Apply all the current changes + * Apply all the changes in new XA transaction. This save should run in dedicated XA transaction, i.e. only JCR storage stuff should be involved to. */ - private void applyChanges(ItemStateChangesLog changesLog) throws RepositoryException + private void saveInTransaction(ItemStateChangesLog changesLog) throws RepositoryException { try { - transactionManager.begin(); + transactionManager.begin(); // start new global tx cache.beginTransaction(); // TODO keep it into the cache impl super.save(changesLog); cache.commitTransaction(); - transactionManager.commit(); + transactionManager.commit(); // commit global tx } catch (RollbackException e) { @@ -497,7 +543,7 @@ try { cache.rollbackTransaction(); - transactionManager.rollback(); + transactionManager.rollback(); // rollback global tx } catch (Exception e1) { @@ -576,9 +622,6 @@ throw new RepositoryException(e); } - - // notify listeners after transaction commit - notifySaveItems(changesLog, false); } /**

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1427 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.

by do-not-reply＠jboss.org

Author: sergiykarpenko Date: 2010-01-16 05:34:39 -0500 (Sat, 16 Jan 2010) New Revision: 1427 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheLockImpl.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java Log: EXOJCR-332: lock token in Lock Data replaced by lock token hash Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheLockImpl.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheLockImpl.java 2010-01-16 10:13:10 UTC (rev 1426) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheLockImpl.java 2010-01-16 10:34:39 UTC (rev 1427) @@ -69,7 +69,7 @@ */ public String getLockToken() { - return lockManager.getLockToken(session.getId(), lockData); + return lockManager.getLockToken(session.getId(), lockData.getTokenHash()); } /** @@ -95,8 +95,8 @@ throw new LockException("Lock is not live"); LockData newLockData = - new LockData(lockData.getNodeIdentifier(), lockData.getToken(), lockData.isDeep(), lockData.isSessionScoped(), - lockData.getOwner(), lockData.getTimeOut()); + new LockData(lockData.getNodeIdentifier(), lockData.getTokenHash(), lockData.isDeep(), lockData + .isSessionScoped(), lockData.getOwner(), lockData.getTimeOut()); lockManager.refresh(newLockData); lockData = newLockData; Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-16 10:13:10 UTC (rev 1426) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-16 10:34:39 UTC (rev 1427) @@ -147,9 +147,9 @@ private final Map<String, LockData> pendingLocks; /** - * [session id , [lock tokens id..]] + * [session id , [lock token hash, lock tokens id]] */ - private final Map<String, Set<String>> lockTokenHolders; + private final Map<String, Map<String, String>> lockTokenHolders; /** * Run time lock time out. @@ -201,7 +201,7 @@ else lockTimeOut = DEFAULT_LOCK_TIMEOUT; - lockTokenHolders = new HashMap<String, Set<String>>(); + lockTokenHolders = new HashMap<String, Map<String, String>>(); pendingLocks = new HashMap<String, LockData>(); dataManager.addItemPersistenceListener(this); @@ -231,7 +231,7 @@ */ public synchronized void addLockToken(String sessionId, String lt) { - holdLockToken(sessionId, lt); + holdLockToken(sessionId, getHash(lt), lt); } /* @@ -262,11 +262,13 @@ } String lockToken = IdGenerator.generate(); + String lockTokenHash = getHash(lockToken); + lData = - new LockData(node.getInternalIdentifier(), lockToken, isDeep, isSessionScoped, node.getSession() - .getUserID(), timeOut > 0 ? timeOut : lockTimeOut); + new LockData(node.getInternalIdentifier(), lockTokenHash, isDeep, isSessionScoped, node.getSession() + .getUserID(), timeOut > 0 ? timeOut : lockTimeOut); - holdLockToken(node.getSession().getId(), lockToken); + holdLockToken(node.getSession().getId(), lockTokenHash, lockToken); pendingLocks.put(node.getInternalIdentifier(), lData); LockImpl lock = new CacheLockImpl(node.getSession(), lData, this); @@ -304,12 +306,12 @@ */ public synchronized String[] getLockTokens(String sessionID) { - Set<String> lockTokens = lockTokenHolders.get(sessionID); + Map<String, String> lockTokens = lockTokenHolders.get(sessionID); if (lockTokens != null) { String[] arr = new String[lockTokens.size()]; - lockTokens.toArray(arr); + lockTokens.values().toArray(arr); return arr; } else @@ -318,17 +320,6 @@ } } - /** - * Returns real token, if session has it - * - * @param lockData - * @return - */ - // public String getLockToken(LockData lockData) - // { - // return tokenHash.get(lockData.getTokenHash()); - // } - @Managed @ManagedDescription("The number of active locks") public int getNumLocks() @@ -373,7 +364,7 @@ public boolean isLockHolder(NodeImpl node) throws RepositoryException { LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); - return lData != null && isLockHolder(node.getSession().getId(), lData.getToken()); + return lData != null && isLockHolder(node.getSession().getId(), lData.getTokenHash()); } /** @@ -398,7 +389,7 @@ { // check is lock holder if (lockTokenHolders.containsKey(session.getId()) - && lockTokenHolders.get(session.getId()).contains(lockData.getToken())) + && lockTokenHolders.get(session.getId()).containsKey(lockData.getTokenHash())) { if (lockData.isSessionScoped()) { @@ -428,7 +419,7 @@ } else { - this.removeLockToken(session.getId(), lockData.getToken()); + removeLockTokenByHash(session.getId(), lockData.getTokenHash()); } } } @@ -591,9 +582,9 @@ */ public synchronized void removeLockToken(String sessionId, String lt) { - if (lockTokenHolders.containsKey(sessionId) && lockTokenHolders.get(sessionId).contains(lt)) + if (lockTokenHolders.containsKey(sessionId) && lockTokenHolders.get(sessionId).containsValue(lt)) { - lockTokenHolders.get(sessionId).remove(lt); + lockTokenHolders.get(sessionId).remove(getHash(lt)); if (lockTokenHolders.get(sessionId).size() == 0) { lockTokenHolders.remove(sessionId); @@ -601,6 +592,18 @@ } } + public synchronized void removeLockTokenByHash(String sessionId, String ltHash) + { + if (lockTokenHolders.containsKey(sessionId) && lockTokenHolders.get(sessionId).containsKey(ltHash)) + { + lockTokenHolders.get(sessionId).remove(ltHash); + if (lockTokenHolders.get(sessionId).size() == 0) + { + lockTokenHolders.remove(sessionId); + } + } + } + /* * (non-Javadoc) * @see org.picocontainer.Startable#start() @@ -739,13 +742,14 @@ return retval; } - private void holdLockToken(String sessionId, String lt) + private void holdLockToken(String sessionId, String ltHash, String lt) { if (lockTokenHolders.get(sessionId) == null) { - lockTokenHolders.put(sessionId, new HashSet<String>()); + lockTokenHolders.put(sessionId, new HashMap<String, String>()); } - lockTokenHolders.get(sessionId).add(lt); + // put token hash and token + lockTokenHolders.get(sessionId).put(ltHash, lt); } /** @@ -830,7 +834,7 @@ // remove session holder if (lockTokenHolders.containsKey(sessionId)) { - lockTokenHolders.get(sessionId).remove(lData.getToken()); + lockTokenHolders.get(sessionId).remove(lData.getTokenHash()); if (lockTokenHolders.get(sessionId).size() == 0) { lockTokenHolders.remove(sessionId); @@ -839,12 +843,12 @@ } } - private boolean isLockHolder(String sessionId, String lockToken) + private boolean isLockHolder(String sessionId, String lockTokenHash) { - Set<String> lockTokens = lockTokenHolders.get(sessionId); + Map<String, String> lockTokens = lockTokenHolders.get(sessionId); if (lockTokens != null) { - return lockTokens.contains(lockToken); + return lockTokens.containsKey(lockTokenHash); } return false; } @@ -920,11 +924,11 @@ } } - public String getLockToken(String sessionId, LockData lockData) + public String getLockToken(String sessionId, String tokenHash) { - if (lockTokenHolders.containsKey(sessionId) && lockTokenHolders.get(sessionId).contains(lockData.getToken())) + if (lockTokenHolders.containsKey(sessionId)) { - return lockData.getToken(); + return lockTokenHolders.get(sessionId).get(tokenHash); } else { Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java 2010-01-16 10:13:10 UTC (rev 1426) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/LockData.java 2010-01-16 10:34:39 UTC (rev 1427) @@ -32,7 +32,7 @@ * @version $Id: LockData.java 787 2009-11-20 11:36:15Z nzamosenchuk $ */ -public class LockData implements Externalizable //extends org.exoplatform.services.jcr.impl.core.lock.LockData +public class LockData implements Externalizable { /** * The time of birth. From this time we start count the time of death. death = birthday+TIME_OUT; @@ -49,7 +49,7 @@ * A lock token is a string that uniquely identifies a particular lock and acts as a “key” * allowing a user to alter a locked node. LockData stores only token hash. */ - private String token; + private String tokenHash; /** * Identifier of locked node. @@ -91,11 +91,11 @@ * @param timeOut * is seconds! */ - public LockData(String nodeIdentifier, String lockToken, boolean deep, boolean sessionScoped, String owner, + public LockData(String nodeIdentifier, String lockTokenHash, boolean deep, boolean sessionScoped, String owner, long timeOut) { this.nodeIdentifier = nodeIdentifier; - this.token = lockToken; + this.tokenHash = lockTokenHash; this.deep = deep; this.sessionScoped = sessionScoped; this.owner = owner; @@ -145,9 +145,9 @@ return birthday + timeOut - System.currentTimeMillis() / 1000; } - public String getToken() + public String getTokenHash() { - return token; + return tokenHash; } /* @@ -157,7 +157,7 @@ @Override public int hashCode() { - return token.hashCode(); + return tokenHash.hashCode(); } public boolean isDeep() @@ -197,7 +197,7 @@ // read token buf = new byte[in.readInt()]; in.readFully(buf); - this.token = new String(buf, Constants.DEFAULT_ENCODING); + this.tokenHash = new String(buf, Constants.DEFAULT_ENCODING); } /** @@ -221,7 +221,7 @@ out.writeInt(ptbuf.length); out.write(ptbuf); // node token - ptbuf = token.getBytes(Constants.DEFAULT_ENCODING); + ptbuf = tokenHash.getBytes(Constants.DEFAULT_ENCODING); out.writeInt(ptbuf.length); out.write(ptbuf);

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1426 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src: main/resources and 1 other directories.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2010-01-16 05:13:10 -0500 (Sat, 16 Jan 2010) New Revision: 1426 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/binding.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-332 : Add setting parameners as property to lock manager configuration. Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-16 09:59:17 UTC (rev 1425) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-16 10:13:10 UTC (rev 1426) @@ -22,6 +22,7 @@ import org.exoplatform.management.jmx.annotations.Property; import org.exoplatform.services.jcr.access.SystemIdentity; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; +import org.exoplatform.services.jcr.config.SimpleParameterEntry; import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.core.ExtendedSession; import org.exoplatform.services.jcr.dataflow.ChangesLogIterator; @@ -85,9 +86,21 @@ */ @Managed @NameTemplate(@Property(key = "service", value = "lockmanager")) -public class CacheableLockManager extends AbstractLockManager implements ItemsPersistenceListener, Startable +public class CacheableLockManager + extends AbstractLockManager + implements ItemsPersistenceListener, Startable { /** + * The name to property time out. + */ + public static final String TIME_OUT = "time-out"; + + /** + * The name to property cache configuration. + */ + public static final String JBOSSCACCHE_CONFIG = "jbosscache-configuration"; + + /** * Default lock time out. 30min */ public static final long DEFAULT_LOCK_TIMEOUT = 1000 * 60 * 30; @@ -121,7 +134,7 @@ /** * Logger */ - private final Log log = ExoLogger.getLogger("jcr.lock.LockManager"); + private final Log log = ExoLogger.getLogger("jcr.lock.CacheableLockManager"); /** * Data manager. @@ -159,19 +172,31 @@ * @param config */ public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config) - throws RepositoryConfigurationException + throws RepositoryConfigurationException { this(dataManager, config, null); } public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config, - LockPersister persister) throws RepositoryConfigurationException + LockPersister persister) throws RepositoryConfigurationException { + List<SimpleParameterEntry> paramenerts = config.getLockManager().getParameters(); + this.dataManager = dataManager; if (config.getLockManager() != null) { - lockTimeOut = - config.getLockManager().getTimeout() > 0 ? config.getLockManager().getTimeout() : DEFAULT_LOCK_TIMEOUT; + if (paramenerts != null && config.getLockManager().getParameterValue(TIME_OUT, null) != null) + { + long timeOut = config.getLockManager().getParameterTime(TIME_OUT); + lockTimeOut = timeOut > 0 ? timeOut : DEFAULT_LOCK_TIMEOUT; + } + else + { + lockTimeOut = + config.getLockManager().getTimeout() > 0 ? config.getLockManager().getTimeout() + : DEFAULT_LOCK_TIMEOUT; + } + } else lockTimeOut = DEFAULT_LOCK_TIMEOUT; @@ -182,9 +207,12 @@ dataManager.addItemPersistenceListener(this); // make cache - if (config.getLockManager() != null && config.getLockManager().getCacheConfig() != null) + if (config.getLockManager() != null + && (config.getLockManager().getCacheConfig() != null || (paramenerts != null && config + .getLockManager().getParameterValue(JBOSSCACCHE_CONFIG, null) != null))) { - String pathToConfig = config.getLockManager().getCacheConfig(); + String pathToConfig = (paramenerts != null && config.getLockManager().getParameterValue(JBOSSCACCHE_CONFIG, null) != null) ? config.getLockManager() + .getParameterValue(JBOSSCACCHE_CONFIG) : config.getLockManager().getCacheConfig(); CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>(); cache = factory.createCache(pathToConfig, false); cache.create(); @@ -213,9 +241,9 @@ * .jcr.impl.core.NodeImpl, boolean, boolean, long) */ public synchronized Lock addPendingLock(NodeImpl node, boolean isDeep, boolean isSessionScoped, long timeOut) - throws LockException + throws LockException { - LockData lData = getLockData((NodeData)node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); + LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); if (lData != null) { if (lData.getNodeIdentifier().equals(node.getInternalIdentifier())) @@ -228,15 +256,15 @@ } } - if (isDeep && getLockData((NodeData)node.getData(), SEARCH_CLOSEDCHILD) != null) + if (isDeep && getLockData((NodeData) node.getData(), SEARCH_CLOSEDCHILD) != null) { throw new LockException("Some child node is locked."); } String lockToken = IdGenerator.generate(); lData = - new LockData(node.getInternalIdentifier(), lockToken, isDeep, isSessionScoped, node.getSession().getUserID(), - timeOut > 0 ? timeOut : lockTimeOut); + new LockData(node.getInternalIdentifier(), lockToken, isDeep, isSessionScoped, node.getSession() + .getUserID(), timeOut > 0 ? timeOut : lockTimeOut); holdLockToken(node.getSession().getId(), lockToken); pendingLocks.put(node.getInternalIdentifier(), lData); @@ -261,7 +289,7 @@ public LockImpl getLock(NodeImpl node) throws LockException, RepositoryException { - LockData lData = getLockData((NodeData)node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); + LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); if (lData == null || (!node.getInternalIdentifier().equals(lData.getNodeIdentifier()) && !lData.isDeep())) { @@ -344,7 +372,7 @@ */ public boolean isLockHolder(NodeImpl node) throws RepositoryException { - LockData lData = getLockData((NodeData)node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); + LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT); return lData != null && isLockHolder(node.getSession().getId(), lData.getToken()); } @@ -364,21 +392,21 @@ */ public synchronized void onCloseSession(ExtendedSession session) { - SessionImpl sessionImpl = (SessionImpl)session; + SessionImpl sessionImpl = (SessionImpl) session; for (LockData lockData : getLockList()) { // check is lock holder if (lockTokenHolders.containsKey(session.getId()) - && lockTokenHolders.get(session.getId()).contains(lockData.getToken())) + && lockTokenHolders.get(session.getId()).contains(lockData.getToken())) { if (lockData.isSessionScoped()) { // if no session currently holds lock except this try { - ((NodeImpl)sessionImpl.getTransientNodesManager().getItemByIdentifier(lockData.getNodeIdentifier(), - false)).unlock(); + ((NodeImpl) sessionImpl.getTransientNodesManager().getItemByIdentifier(lockData.getNodeIdentifier(), + false)).unlock(); } catch (UnsupportedRepositoryOperationException e) { @@ -416,7 +444,7 @@ List<PlainChangesLog> chengesLogList = new ArrayList<PlainChangesLog>(); if (changesLog instanceof TransactionChangesLog) { - ChangesLogIterator logIterator = ((TransactionChangesLog)changesLog).getLogIterator(); + ChangesLogIterator logIterator = ((TransactionChangesLog) changesLog).getLogIterator(); while (logIterator.hasNextLog()) { @@ -425,11 +453,11 @@ } else if (changesLog instanceof PlainChangesLog) { - chengesLogList.add((PlainChangesLog)changesLog); + chengesLogList.add((PlainChangesLog) changesLog); } else if (changesLog instanceof CompositeChangesLog) { - for (ChangesLogIterator iter = ((CompositeChangesLog)changesLog).getLogIterator(); iter.hasNextLog();) + for (ChangesLogIterator iter = ((CompositeChangesLog) changesLog).getLogIterator(); iter.hasNextLog();) { chengesLogList.add(iter.nextLog()); } @@ -446,7 +474,7 @@ if (currChangesLog.getSize() < 2) { log.error("Incorrect changes log of type ExtendedEvent.LOCK size=" + currChangesLog.getSize() - + "<2 \n" + currChangesLog.dump()); + + "<2 \n" + currChangesLog.dump()); break; } nodeIdentifier = currChangesLog.getAllStates().get(0).getData().getParentIdentifier(); @@ -464,12 +492,12 @@ if (currChangesLog.getSize() < 2) { log.error("Incorrect changes log of type ExtendedEvent.UNLOCK size=" + currChangesLog.getSize() - + "<2 \n" + currChangesLog.dump()); + + "<2 \n" + currChangesLog.dump()); break; } internalUnLock(currChangesLog.getSessionId(), currChangesLog.getAllStates().get(0).getData() - .getParentIdentifier()); + .getParentIdentifier()); break; default : HashSet<String> removedLock = new HashSet<String>(); @@ -529,7 +557,7 @@ else { throw new LockException("Can't refresh lock for node " + newLockData.getNodeIdentifier() - + " since lock is not exist"); + + " since lock is not exist"); } } } @@ -621,8 +649,8 @@ // make a copy, value may be null for deleting items TransientPropertyData newData = - new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), - prop.getParentIdentifier(), prop.isMultiValued(), prop.getValues()); + new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop + .getType(), prop.getParentIdentifier(), prop.isMultiValued(), prop.getValues()); return newData; } @@ -670,7 +698,7 @@ if (retval == null && (searchType & SEARCH_CLOSEDPARENT) != 0) { - NodeData parentData = (NodeData)dataManager.getItemData(data.getParentIdentifier()); + NodeData parentData = (NodeData) dataManager.getItemData(data.getParentIdentifier()); if (parentData != null) { retval = getLockDataById(parentData.getIdentifier()); @@ -740,12 +768,12 @@ node.setResident(true); // this will return null if success. And old data if something exists... - LockData oldLockData = (LockData)node.putIfAbsent(LOCK_DATA, lockData); + LockData oldLockData = (LockData) node.putIfAbsent(LOCK_DATA, lockData); if (oldLockData != null) { throw new LockException("Unable to write LockData. Node [" + lockData.getNodeIdentifier() - + "] already has LockData!"); + + "] already has LockData!"); } pendingLocks.remove(nodeIdentifier); } @@ -832,7 +860,7 @@ Node<Serializable, Object> node = lockRoot.getChild(Fqn.fromString(nodeId)); if (node != null) { - lockData = (LockData)node.get(LOCK_DATA); + lockData = (LockData) node.get(LOCK_DATA); } return lockData; } @@ -846,7 +874,7 @@ { if (node != null) { - LockData lockData = (LockData)node.get(LOCK_DATA); + LockData lockData = (LockData) node.get(LOCK_DATA); if (lockData != null) { locksData.add(lockData); @@ -865,17 +893,19 @@ { try { - NodeData nData = (NodeData)dataManager.getItemData(nodeIdentifier); + NodeData nData = (NodeData) dataManager.getItemData(nodeIdentifier); PlainChangesLog changesLog = - new PlainChangesLogImpl(new ArrayList<ItemState>(), SystemIdentity.SYSTEM, ExtendedEvent.UNLOCK); + new PlainChangesLogImpl(new ArrayList<ItemState>(), SystemIdentity.SYSTEM, ExtendedEvent.UNLOCK); ItemData lockOwner = - copyItemData((PropertyData)dataManager.getItemData(nData, new QPathEntry(Constants.JCR_LOCKOWNER, 1))); + copyItemData((PropertyData) dataManager + .getItemData(nData, new QPathEntry(Constants.JCR_LOCKOWNER, 1))); changesLog.add(ItemState.createDeletedState(lockOwner)); ItemData lockIsDeep = - copyItemData((PropertyData)dataManager.getItemData(nData, new QPathEntry(Constants.JCR_LOCKISDEEP, 1))); + copyItemData((PropertyData) dataManager.getItemData(nData, + new QPathEntry(Constants.JCR_LOCKISDEEP, 1))); changesLog.add(ItemState.createDeletedState(lockIsDeep)); // lock probably removed by other thread Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/binding.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/binding.xml 2010-01-16 09:59:17 UTC (rev 1425) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/binding.xml 2010-01-16 10:13:10 UTC (rev 1426) @@ -66,9 +66,11 @@ <structure name="lock-manager" field="lockManager" usage="optional"> <value name="class" field="type" style="attribute" usage="optional" /> + <collection name="properties" field="parameters" usage="optional" + item-type="org.exoplatform.services.jcr.config.SimpleParameterEntry" + factory="org.jibx.runtime.Utility.arrayListFactory" /> <value name="time-out" field="timeout" usage="optional" deserializer="org.exoplatform.services.jcr.util.ConfigurationFormat.parseTime" /> - <value name="jbosscache-configuration" field="cacheConfig" usage="optional" /> <structure name="persister" field="persister" usage="optional"> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml 2010-01-16 09:59:17 UTC (rev 1425) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml 2010-01-16 10:13:10 UTC (rev 1426) @@ -3,4 +3,26 @@ <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="3600000"/> +  + </jbosscache> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-01-16 09:59:17 UTC (rev 1425) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-01-16 10:13:10 UTC (rev 1426) @@ -80,8 +80,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> @@ -123,8 +125,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> @@ -166,8 +170,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> @@ -241,8 +247,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> </workspaces> @@ -301,8 +309,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> @@ -350,8 +360,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> @@ -402,8 +414,10 @@ </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager"> - <time-out>15m</time-out> - <jbosscache-configuration>conf/standalone/test-jbosscache-lockconfig.xml</jbosscache-configuration> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lockconfig.xml" /> + </properties> </lock-manager> </workspace> </workspaces>

16 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits January 2010