[exo-jcr-commits] exo-jcr SVN: r4178 - in jcr/trunk: applications/product-patches/as/jonas and 5 other directories.

Author: nfilotto Date: 2011-03-25 12:58:38 -0400 (Fri, 25 Mar 2011) New Revision: 4178 Removed: jcr/trunk/applications/product-patches/as/jetty/exo-conf/ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-config.xml jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-ispn-config.xml jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-jbc-config.xml Modified: jcr/trunk/applications/product-patches/as/jetty/eXo.bat jcr/trunk/applications/product-patches/as/jetty/eXo.sh jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml Log: EXOJCR-1260: Improved the configuration using EXOJCR-1268 and EXOJCR-1269 Modified: jcr/trunk/applications/product-patches/as/jetty/eXo.bat =================================================================== --- jcr/trunk/applications/product-patches/as/jetty/eXo.bat 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jetty/eXo.bat 2011-03-25 16:58:38 UTC (rev 4178) @@ -1 +1 @@ -java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true -jar start.jar +java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar Modified: jcr/trunk/applications/product-patches/as/jetty/eXo.sh =================================================================== --- jcr/trunk/applications/product-patches/as/jetty/eXo.sh 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jetty/eXo.sh 2011-03-25 16:58:38 UTC (rev 4178) @@ -1 +1 @@ -java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -jar start.jar +java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=. -jar start.jar Modified: jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml =================================================================== --- jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - 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. + +--> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> @@ -43,7 +43,7 @@ <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" /> <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> <property name="log4j.appender.file" value="org.apache.log4j.FileAppender" /> - <property name="log4j.appender.file.File" value="logs/jcr.log" /> + <property name="log4j.appender.file.File" value="${exo.jcr.parent.dir:..}/logs/jcr.log" /> <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout" /> <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG" / --> @@ -58,17 +58,17 @@ <value-param> <name>conf-path</name> <description>JCR configuration file</description> - <value>exo-conf/exo-jcr-config.xml</value> + <value>jar:/conf/portal/exo-jcr-config.xml</value> </value-param> <value-param profiles="ispn"> <name>conf-path</name> <description>JCR configuration file</description> - <value>exo-conf/exo-jcr-ispn-config.xml</value> + <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value> </value-param> <value-param profiles="jbc"> <name>conf-path</name> <description>JCR configuration file</description> - <value>exo-conf/exo-jcr-jbc-config.xml</value> + <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value> </value-param> </init-params> </component> @@ -182,7 +182,7 @@ <key>org.jboss.cache.transaction.TransactionManagerLookup</key> <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> </component> - + <component profiles="ispn,jbc"> <key>org.exoplatform.services.transaction.TransactionService</key> <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> @@ -300,7 +300,7 @@ </value-param> <value-param> <name>cache-folder-name</name> - <value>temp/ftp_cache</value> + <value>${exo.jcr.parent.dir:..}/temp/ftp_cache</value> </value-param> <!-- bytes per second --> @@ -327,9 +327,9 @@ <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> </component> - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> + <component> + <key>org.exoplatform.services.security.Authenticator</key> + <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> </component> <component> @@ -359,7 +359,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:temp/data/exodb" /> + <property name="url" value="jdbc:hsqldb:file:${exo.jcr.parent.dir:..}/temp/data/exodb" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> Modified: jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat =================================================================== --- jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat 2011-03-25 16:58:38 UTC (rev 4178) @@ -80,7 +80,7 @@ Rem ----------------------- Begin eXo configuration ---------------------------- cd %JONAS_ROOT%/bin -set JONAS_OPTS=%JONAS_OPTS% -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true +set JONAS_OPTS=%JONAS_OPTS% -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=../.. set JAVA_OPTS=%JAVA_OPTS% -Xmx512M if ""%1"" == ""jbc"" shift if ""%1"" == ""ispn"" shift Modified: jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas =================================================================== --- jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas 2011-03-25 16:58:38 UTC (rev 4178) @@ -79,7 +79,7 @@ # ------------------------- Begin eXo configuration ---------------------------- cd $JONAS_ROOT/bin -JONAS_OPTS="$JONAS_OPTS -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true" +JONAS_OPTS="$JONAS_OPTS -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=../.." JAVA_OPTS="$JAVA_OPTS -Xmx512M" if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then shift Deleted: jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-config.xml =================================================================== --- jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-config.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-config.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -1,169 +0,0 @@ -<!-- - - 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"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="production"> - <!-- for system storage --> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/production" /> - </properties> - <value-storages> - <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../../temp/values/production" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="10k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../../temp/jcrlucenedb/production" /> - </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="../../temp/lock/production" /> - </properties> - </persister> - </lock-manager> - </workspace> - - <workspace name="backup"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/backup" /> - </properties> - <value-storages> - <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../../temp/values/backup" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="10k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../../temp/jcrlucenedb/backup" /> - </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="../../temp/lock/backup" /> - </properties> - </persister> - </lock-manager> - </workspace> - - <workspace name="digital-assets"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/digital-assets" /> - </properties> - <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" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:folder" /> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="15m" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="../../temp/jcrlucenedb/digital-assets" /> - </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="../../temp/lock/digital-assets" /> - </properties> - </persister> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> Deleted: jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-ispn-config.xml =================================================================== --- jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-ispn-config.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-ispn-config.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -1,214 +0,0 @@ -<!-- - - 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"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="production"> - <!-- for system storage --> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/production" /> - </properties> - <value-storages> - <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../../temp/values/production" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> - <properties> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - </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="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.infinispan.ISPNCacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> - <property name="infinispan-cl-cache.jdbc.table.create" value="true" /> - <property name="infinispan-cl-cache.jdbc.table.drop" value="false" /> - <property name="infinispan-cl-cache.jdbc.id.column" value="id" /> - <property name="infinispan-cl-cache.jdbc.data.column" value="data" /> - <property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" /> - <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" /> - <property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" /> - </properties> - </lock-manager> - </workspace> - - <workspace name="backup"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/backup" /> - </properties> - <value-storages> - <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../../temp/values/backup" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> - <properties> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - </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="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.infinispan.ISPNCacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> - <property name="infinispan-cl-cache.jdbc.table.create" value="true" /> - <property name="infinispan-cl-cache.jdbc.table.drop" value="false" /> - <property name="infinispan-cl-cache.jdbc.id.column" value="id" /> - <property name="infinispan-cl-cache.jdbc.data.column" value="data" /> - <property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" /> - <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" /> - <property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" /> - </properties> - </lock-manager> - </workspace> - - <workspace name="digital-assets"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/digital-assets" /> - </properties> - <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" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:folder" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> - <properties> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - </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="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.infinispan.ISPNCacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> - <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> - <property name="infinispan-cl-cache.jdbc.table.create" value="true" /> - <property name="infinispan-cl-cache.jdbc.table.drop" value="false" /> - <property name="infinispan-cl-cache.jdbc.id.column" value="id" /> - <property name="infinispan-cl-cache.jdbc.data.column" value="data" /> - <property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" /> - <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" /> - <property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" /> - </properties> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> Deleted: jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-jbc-config.xml =================================================================== --- jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-jbc-config.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-jbc-config.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -1,235 +0,0 @@ -<!-- - - 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"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="production"> - <!-- for system storage --> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/production" /> - </properties> - <value-storages> - <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../../temp/values/production" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-data.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> - <property name="jbosscache-shareable" value="true" /> - </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="changesfilter-class" - value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-indexer.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> - <property name="jbosscache-shareable" value="true" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-lock.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-locks" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> - <property name="jbosscache-shareable" value="true" /> - </properties> - </lock-manager> - </workspace> - - <workspace name="backup"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/backup" /> - </properties> - <value-storages> - <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../../temp/values/backup" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-data.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> - <property name="jbosscache-shareable" value="true" /> - </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="changesfilter-class" - value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-indexer.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> - <property name="jbosscache-shareable" value="true" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-lock.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-locks" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> - <property name="jbosscache-shareable" value="true" /> - </properties> - </lock-manager> - </workspace> - - <workspace name="digital-assets"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../../temp/swap/digital-assets" /> - </properties> - <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" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:folder" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-data.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> - <property name="jbosscache-shareable" value="true" /> - </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="changesfilter-class" - value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-indexer.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> - <property name="jbosscache-shareable" value="true" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-lock.xml" /> - <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-locks" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> - <property name="jbosscache-shareable" value="true" /> - </properties> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> Modified: jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml =================================================================== --- jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - 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. + +--> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> @@ -43,7 +43,7 @@ <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" /> <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> <property name="log4j.appender.file" value="org.apache.log4j.FileAppender" /> - <property name="log4j.appender.file.File" value="../../logs/jcr.log" /> + <property name="log4j.appender.file.File" value="${exo.jcr.parent.dir:..}/logs/jcr.log" /> <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout" /> <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG" / --> @@ -58,17 +58,17 @@ <value-param> <name>conf-path</name> <description>JCR configuration file</description> - <value>exo-conf/exo-jcr-config.xml</value> + <value>jar:/conf/portal/exo-jcr-config.xml</value> </value-param> <value-param profiles="ispn"> <name>conf-path</name> <description>JCR configuration file</description> - <value>exo-conf/exo-jcr-ispn-config.xml</value> + <value>jar:/conf/portal/exo-jcr-ispn-config.xml</value> </value-param> <value-param profiles="jbc"> <name>conf-path</name> <description>JCR configuration file</description> - <value>exo-conf/exo-jcr-jbc-config.xml</value> + <value>jar:/conf/portal/exo-jcr-jbc-config.xml</value> </value-param> </init-params> </component> @@ -182,7 +182,7 @@ <key>org.jboss.cache.transaction.TransactionManagerLookup</key> <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> </component> - + <component profiles="ispn,jbc"> <key>org.exoplatform.services.transaction.TransactionService</key> <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> @@ -300,7 +300,7 @@ </value-param> <value-param> <name>cache-folder-name</name> - <value>../../temp/ftp_cache</value> + <value>${exo.jcr.parent.dir:..}/temp/ftp_cache</value> </value-param> <!-- bytes per second --> @@ -327,9 +327,9 @@ <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> </component> - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> + <component> + <key>org.exoplatform.services.security.Authenticator</key> + <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> </component> <component> @@ -359,7 +359,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:../../temp/data/exodb" /> + <property name="url" value="jdbc:hsqldb:file:${exo.jcr.parent.dir:..}/temp/data/exodb" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml =================================================================== --- jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -43,7 +43,7 @@ <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" /> <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> <property name="log4j.appender.file" value="org.apache.log4j.FileAppender" /> - <property name="log4j.appender.file.File" value="../logs/jcr.log" /> + <property name="log4j.appender.file.File" value="${exo.jcr.parent.dir:..}/logs/jcr.log" /> <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout" /> <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" /> <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG" / --> @@ -300,7 +300,7 @@ </value-param> <value-param> <name>cache-folder-name</name> - <value>../temp/ftp_cache</value> + <value>${exo.jcr.parent.dir:..}/temp/ftp_cache</value> </value-param> <!-- bytes per second --> @@ -359,7 +359,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:../temp/data/exodb" /> + <property name="url" value="jdbc:hsqldb:file:${exo.jcr.parent.dir:..}/temp/data/exodb" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -33,12 +33,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/production" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" /> </properties> <value-storages> <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/production" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/values/production" /> </properties> <filters> <filter property-type="Binary" /> @@ -59,14 +59,14 @@ </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/production" /> </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="../temp/lock/production" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/lock/production" /> </properties> </persister> </lock-manager> @@ -79,12 +79,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/backup" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" /> </properties> <value-storages> <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/backup" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/values/backup" /> </properties> <filters> <filter property-type="Binary" /> @@ -105,14 +105,14 @@ </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/backup" /> </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="../temp/lock/backup" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/lock/backup" /> </properties> </persister> </lock-manager> @@ -125,12 +125,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/digital-assets" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" /> </properties> <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="${exo.jcr.parent.dir:..}/temp/values/digital-assets" /> </properties> <filters> <filter property-type="Binary" /> @@ -151,14 +151,14 @@ </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/digital-assets" /> </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="../temp/lock/digital-assets" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/lock/digital-assets" /> </properties> </persister> </lock-manager> Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -33,12 +33,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/production" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" /> </properties> <value-storages> <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/production" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/values/production" /> </properties> <filters> <filter property-type="Binary" /> @@ -55,16 +55,16 @@ class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/production" /> <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> <property name="max-volatile-time" value="60" /> </properties> @@ -73,7 +73,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> <property name="infinispan-cl-cache.jdbc.table.create" value="true" /> @@ -94,12 +94,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/backup" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" /> </properties> <value-storages> <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/backup" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/values/backup" /> </properties> <filters> <filter property-type="Binary" /> @@ -116,16 +116,16 @@ class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/backup" /> <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> <property name="max-volatile-time" value="60" /> </properties> @@ -134,7 +134,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> <property name="infinispan-cl-cache.jdbc.table.create" value="true" /> @@ -155,12 +155,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/digital-assets" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" /> </properties> <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="${exo.jcr.parent.dir:..}/temp/values/digital-assets" /> </properties> <filters> <filter property-type="Binary" /> @@ -177,16 +177,16 @@ class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/digital-assets" /> <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-indexer.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> <property name="max-volatile-time" value="60" /> </properties> @@ -195,7 +195,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="conf/portal/cluster/udp-mux.xml" /> + <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> <property name="infinispan-cl-cache.jdbc.table.create" value="true" /> Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-03-25 16:21:35 UTC (rev 4177) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-03-25 16:58:38 UTC (rev 4178) @@ -33,12 +33,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/production" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" /> </properties> <value-storages> <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/production" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/values/production" /> </properties> <filters> <filter property-type="Binary" /> @@ -63,7 +63,7 @@ </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/production" /> <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-indexer.xml" /> @@ -101,12 +101,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/backup" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" /> </properties> <value-storages> <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/backup" /> + <property name="path" value="${exo.jcr.parent.dir:..}/temp/values/backup" /> </properties> <filters> <filter property-type="Binary" /> @@ -131,7 +131,7 @@ </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/backup" /> <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-indexer.xml" /> @@ -169,12 +169,12 @@ <property name="multi-db" value="false" /> <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/digital-assets" /> + <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" /> </properties> <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="${exo.jcr.parent.dir:..}/temp/values/digital-assets" /> </properties> <filters> <filter property-type="Binary" /> @@ -199,7 +199,7 @@ </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="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/digital-assets" /> <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> <property name="jbosscache-configuration" value="jar:/conf/portal/cluster/jbosscache-indexer.xml" />