Author: julien_viet Date: 2010-04-24 09:57:08 -0400 (Sat, 24 Apr 2010) New Revision: 2753 Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: GTNPORTAL-946: Externalize the various cache configuration in the configuration property file Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-24 13:57:08 UTC (rev 2753) @@ -34,8 +34,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values +gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter +gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml # IDM gatein.idm.datasource.name=java:jdbcidm Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-24 13:57:08 UTC (rev 2753) @@ -34,8 +34,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values +gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter +gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml # IDM gatein.idm.datasource.name=jdbcidm Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-04-24 13:57:08 UTC (rev 2753) @@ -55,8 +55,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> </properties> @@ -65,8 +65,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> <property name="max-volatile-time" value="60" /> @@ -75,8 +75,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" /> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-04-24 13:57:08 UTC (rev 2753) @@ -55,8 +55,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> </properties> @@ -65,8 +65,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> <property name="max-volatile-time" value="60" /> @@ -75,8 +75,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" /> 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-04-23 15:13:12 UTC (rev 2752) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-04-24 13:57:08 UTC (rev 2753) @@ -57,8 +57,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" /> </properties> @@ -67,8 +67,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> <property name="max-volatile-time" value="60" /> @@ -77,8 +77,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" /> @@ -103,7 +103,7 @@ <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> - </properties> + </properties> ∂ <value-storages> <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> @@ -123,8 +123,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" /> </properties> @@ -133,8 +133,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" /> <property name="max-volatile-time" value="60" /> @@ -143,8 +143,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" /> @@ -189,8 +189,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-work" /> </properties> @@ -199,8 +199,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-work${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-work" /> <property name="max-volatile-time" value="60" /> @@ -209,8 +209,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_work" /> @@ -256,8 +256,8 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" /> </properties> @@ -266,8 +266,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" /> <property name="max-volatile-time" value="60" /> @@ -276,8 +276,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="true" /> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" /> @@ -323,8 +323,8 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml"/> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> <property name="jgroups-multiplexer-stack" value="true"/> <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> </properties> @@ -333,8 +333,8 @@ <properties> <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/> <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml"/> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> <property name="jgroups-multiplexer-stack" value="true"/> <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> <property name="max-volatile-time" value="60"/> @@ -343,8 +343,8 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> <property name="time-out" value="15m"/> - <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml"/> - <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> <property name="jgroups-multiplexer-stack" value="true"/> <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system"/> <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/>