Author: julien_viet Date: 2010-01-23 11:28:10 -0500 (Sat, 23 Jan 2010) New Revision: 1430 Added: portal/trunk/component/common/src/main/java/conf/jcr/ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-system.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-work.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-system.xml portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-wsrp-system.xml Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: GTNPORTAL-550 : JCR 1.12.0-Beta06 integration Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml (rev 0) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -0,0 +1,37 @@ +<!-- + ~ Copyright (C) 2009 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> + + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <!-- Enable batching --> + <invocationBatching enabled="true" /> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> + <property name="maxNodes" value="5000" /> + <property name="minTimeToLive" value="60000" /> + </default> + </eviction> + +</jbosscache> \ No newline at end of file Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-system.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-system.xml (rev 0) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-system.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -0,0 +1,44 @@ +<!-- + ~ Copyright (C) 2009 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + +<!-- + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jcr_lock_portal_system + 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=OBJECT + cache.jdbc.parent.column=parent + cache.jdbc.datasource=jdbcexo_portal + </properties> + </loader> + </loaders> +--> +</jbosscache> \ No newline at end of file Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-work.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-work.xml (rev 0) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-portal-work.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -0,0 +1,44 @@ +<!-- + ~ Copyright (C) 2009 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + +<!-- + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jcr_lock_portal_work + 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=OBJECT + cache.jdbc.parent.column=parent + cache.jdbc.datasource=jdbcexo_portal + </properties> + </loader> + </loaders> +--> +</jbosscache> \ No newline at end of file Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-system.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-system.xml (rev 0) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-system.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -0,0 +1,44 @@ +<!-- + ~ Copyright (C) 2009 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + +<!-- + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jcr_lock_system + 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=OBJECT + cache.jdbc.parent.column=parent + cache.jdbc.datasource=jdbcexo_portal + </properties> + </loader> + </loaders> +--> +</jbosscache> \ No newline at end of file Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-wsrp-system.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-wsrp-system.xml (rev 0) +++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/lockconfig-wsrp-system.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -0,0 +1,44 @@ +<!-- + ~ Copyright (C) 2009 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2"> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + +<!-- + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jcr_lock_wsrp_system + 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=OBJECT + cache.jdbc.parent.column=parent + cache.jdbc.datasource=jdbcexo_portal + </properties> + </loader> + </loaders> +--> +</jbosscache> \ No newline at end of file Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2010-01-23 16:28:10 UTC (rev 1430) @@ -20,6 +20,7 @@ package org.exoplatform.services.organization.idm; import org.exoplatform.commons.utils.LazyPageList; +import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.services.cache.CacheService; import org.exoplatform.services.cache.ExoCache; import org.exoplatform.services.organization.Query; @@ -208,7 +209,12 @@ return new LazyPageList(new IDMUserListAccess(this, service_, qb, pageSize, true), pageSize); } - // + public ListAccess<User> findAllUsers() throws Exception + { + throw new UnsupportedOperationException(); + } + +// public boolean authenticate(String username, String password) throws Exception { User user = findUserByName(username); @@ -269,6 +275,12 @@ } // + + public ListAccess<User> findUsersByQuery(Query query) throws Exception + { + throw new UnsupportedOperationException(); + } + public LazyPageList findUsersByGroup(String groupId) throws Exception { UserQueryBuilder qb = service_.getIdentitySession().createUserQueryBuilder(); @@ -280,8 +292,13 @@ return new LazyPageList(new IDMUserListAccess(this, service_, qb, 20, false), 20); } - // + public ListAccess<User> findUsersByGroupId(String groupId) throws Exception + { + throw new UnsupportedOperationException(); + } +// + private void preSave(User user, boolean isNew) throws Exception { for (UserEventListener listener : listeners_) Modified: portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml =================================================================== --- portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/component/test/core/src/main/resources/conf/portal-configuration.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -31,6 +31,7 @@ <properties-param> <name>default-properties</name> <description>Default initial context properties</description> + <property name="java.naming.factory.initial" value="org.exoplatform.services.naming.SimpleContextFactory" /> </properties-param> </init-params> </component> Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -53,10 +53,9 @@ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/exo.portal.component.test.jcr-jbosscache-config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -64,14 +63,12 @@ <property name="index-dir" value="${gatein.tmp.dir}/jcr/jcrlucenedb/system"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.tmp.dir}/jcr/lock/system"/> - </properties> - </persister> - </lock-manager> + <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/exo.portal.component.test.jcr-jbosscache-lockconfig-system.xml" /> + </properties> + </lock-manager> </workspace> <!-- Portal system data --> @@ -102,10 +99,9 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/exo.portal.component.test.jcr-jbosscache-config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -113,13 +109,11 @@ <property name="index-dir" value="${gatein.tmp.dir}/jcr/jcrlucenedb/portal-test"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.tmp.dir}/jcr/lock/portal-test"/> - </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/exo.portal.component.test.jcr-jbosscache-lockconfig-portal-test.xml" /> + </properties> </lock-manager> </workspace> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/pom.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -38,10 +38,10 @@ <name>GateIn - Portal</name> <properties> - <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.jcr.version>1.12.0-Beta05</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.2.0-Beta06</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta06</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.0-Beta06</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.12.0-Beta06</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>SNAPSHOT-r790473</org.shindig.version> <org.gatein.common.version>2.0.0-CR03</org.gatein.common.version> @@ -49,12 +49,12 @@ <org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version> <org.picketlink.idm>1.1.0.Beta2</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta06</org.gatein.wsrp.version> - <org.gatein.mop.version>1.0.0-Beta14</org.gatein.mop.version> + <org.gatein.mop.version>1.0.0-Beta15</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> <javax.servlet.version>2.5</javax.servlet.version> - <version.chromattic>1.0.0-beta14</version.chromattic> + <version.chromattic>1.0.0-beta15</version.chromattic> <version.reflect>1.0.0-beta5</version.reflect> <!-- ************** --> @@ -574,6 +574,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> + <value>${project.build.directory}</value> + </property> + </systemProperties> + </configuration> + </plugin> </plugins> </build> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -31,9 +31,6 @@ <properties-param> <name>default-properties</name> <description>Default initial context properties</description> - <!-- - <property name="java.naming.factory.initial" value="org.exoplatform.services.naming.SimpleContextFactory"/> - --> </properties-param> </init-params> </component> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -36,7 +36,7 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/system${container.name.suffix}"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/system${container.name.suffix}"/> </properties> <value-storages> <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> @@ -55,10 +55,9 @@ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -66,14 +65,12 @@ <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/system${container.name.suffix}"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/system${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> + <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/jcr/jbosscache/local/lockconfig-system.xml" /> + </properties> + </lock-manager> </workspace> <!-- Portal system data --> @@ -104,10 +101,9 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -115,13 +111,11 @@ <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/portal-system${container.name.suffix}"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/portal-system${container.name.suffix}"/> - </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/jcr/jbosscache/local/lockconfig-portal-system.xml" /> + </properties> </lock-manager> </workspace> @@ -153,26 +147,24 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> + </properties> + </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/portal-work${container.name.suffix}"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/portal-work${container.name.suffix}"/> - </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/jcr/jbosscache/local/lockconfig-portal-work.xml" /> + </properties> </lock-manager> </workspace> + <!-- Workspace for WSRP --> <workspace name="wsrp-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> @@ -199,14 +191,12 @@ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -214,15 +204,14 @@ <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/wsrp${container.name.suffix}"/> </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="${gatein.jcr.data.dir}/lock/wsrp${container.name.suffix}"/> - </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/jcr/jbosscache/local/lockconfig-wsrp-system.xml" /> + </properties> </lock-manager> </workspace> + </workspaces> </repository> </repositories> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-01-23 10:28:09 UTC (rev 1429) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-01-23 16:28:10 UTC (rev 1430) @@ -55,10 +55,9 @@ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -66,14 +65,12 @@ <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/system${container.name.suffix}"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/system${container.name.suffix}"/> - </properties> - </persister> - </lock-manager> + <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/jcr/jbosscache/local/lockconfig-system.xml" /> + </properties> + </lock-manager> </workspace> <!-- Portal system data --> @@ -104,10 +101,9 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -115,13 +111,11 @@ <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/portal-system${container.name.suffix}"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/portal-system${container.name.suffix}"/> - </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/jcr/jbosscache/local/lockconfig-portal-system.xml" /> + </properties> </lock-manager> </workspace> @@ -153,26 +147,24 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> - </properties> - </cache> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> + </properties> + </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/portal-work${container.name.suffix}"/> </properties> </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/portal-work${container.name.suffix}"/> - </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/jcr/jbosscache/local/lockconfig-portal-work.xml" /> + </properties> </lock-manager> </workspace> + <!-- Workspace for WSRP --> <workspace name="wsrp-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> @@ -199,14 +191,12 @@ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> </properties> </initializer> - <cache enabled="true"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="20000"/> - <property name="live-time" value="30000"/> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -214,13 +204,11 @@ <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/wsrp${container.name.suffix}"/> </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="${gatein.jcr.data.dir}/lock/wsrp${container.name.suffix}"/> - </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/jcr/jbosscache/local/lockconfig-wsrp-system.xml" /> + </properties> </lock-manager> </workspace>