Author: dkatayev Date: 2010-01-12 06:35:39 -0500 (Tue, 12 Jan 2010) New Revision: 1357 Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/JBossTransactionManagerLookup.java Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml Log: EXOJCR-334 org.exoplatform.services.transaction.jbosscache.JBossTransactionManagerLookup added Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/JBossTransactionManagerLookup.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/JBossTransactionManagerLookup.java (rev 0) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/JBossTransactionManagerLookup.java 2010-01-12 11:35:39 UTC (rev 1357) @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.transaction.jbosscache; + +import org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup; +import org.jboss.cache.transaction.TransactionManagerLookup; + +import javax.transaction.TransactionManager; + +/** + * @author <a href="mailto:dmitry.kataev@exoplatform.com">Dmytro Katayev</a> + * @version $Id$ + */ +public class JBossTransactionManagerLookup implements TransactionManagerLookup +{ + + protected JBossStandaloneJTAManagerLookup jtaManagerLookup; + + /** + * + */ + public JBossTransactionManagerLookup(JBossStandaloneJTAManagerLookup jtaManagerLookup) + { + this.jtaManagerLookup = jtaManagerLookup; + } + + /** + * {@inheritDoc} + */ + public TransactionManager getTransactionManager() throws Exception + { + return jtaManagerLookup.getTransactionManager(); + } + +} Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2010-01-12 11:27:19 UTC (rev 1356) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2010-01-12 11:35:39 UTC (rev 1357) @@ -1,23 +1,13 @@ -<!-- - 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. - ---> + 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. + --> <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="production" default-workspace="production"> @@ -30,7 +20,7 @@ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> - <property name="dialect" value="hsqldb" /> + <property name="dialect" value="oracle" /> <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> @@ -39,7 +29,7 @@ <value-storages> <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/production" /> + <property name="path" value="/mnt/tornado/temp/values/production" /> </properties> <filters> <filter property-type="Binary" /> @@ -52,15 +42,16 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="10k" /> - <property name="live-time" value="1h" /> + <property name="jbosscache-configuration" value="conf/portal/test-jbosscache-config-repository-production.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/production" /> + <property name="index-dir" value="/mnt/tornado/temp/jcrlucenedb/production" /> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" /> + <property name="changesfilter-config-path" value="conf/portal/test-jbosscache-indexer-config-repository-production.xml" /> </properties> </query-handler> <lock-manager> @@ -77,7 +68,7 @@ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> - <property name="dialect" value="hsqldb" /> + <property name="dialect" value="oracle" /> <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> @@ -86,7 +77,7 @@ <value-storages> <value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/backup" /> + <property name="path" value="/mnt/tornado/temp/values/backup" /> </properties> <filters> <filter property-type="Binary" /> @@ -99,15 +90,16 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="10k" /> - <property name="live-time" value="1h" /> + <property name="jbosscache-configuration" value="conf/portal/test-jbosscache-config-repository-backup.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/backup" /> + <property name="index-dir" value="/mnt/tornado/temp/jcrlucenedb/backup" /> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" /> + <property name="changesfilter-config-path" value="conf/portal/test-jbosscache-indexer-config-repository-backup.xml" /> </properties> </query-handler> </workspace> @@ -116,7 +108,7 @@ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="jdbcjcr" /> - <property name="dialect" value="hsqldb" /> + <property name="dialect" value="oracle" /> <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> @@ -125,7 +117,7 @@ <value-storages> <value-storage id="digital-assets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/digital-assets" /> + <property name="path" value="/mnt/tornado/temp/values/digital-assets" /> </properties> <filters> <filter property-type="Binary" /> @@ -138,15 +130,16 @@ <property name="root-nodetype" value="nt:folder" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="15m" /> + <property name="jbosscache-configuration" value="conf/portal/test-jbosscache-config-repository-digital-assets.xml" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/digital-assets" /> + <property name="index-dir" value="/mnt/tornado/temp/jcrlucenedb/digital-assets" /> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" /> + <property name="changesfilter-config-path" value="conf/portal/test-jbosscache-indexer-config-repository-digital-assets.xml" /> </properties> </query-handler> </workspace>