exo-jcr SVN: r4177 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-25 12:21:35 -0400 (Fri, 25 Mar 2011)
New Revision: 4177
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
Log:
EXOJCR-1268: Allow to rely on the ConfigurationManager to get the JGroups configuration when we use ISPN as underlying cache
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-03-25 15:13:50 UTC (rev 4176)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-03-25 16:21:35 UTC (rev 4177)
@@ -160,6 +160,10 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2011-03-25 15:13:50 UTC (rev 4176)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2011-03-25 16:21:35 UTC (rev 4177)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.jcr.infinispan;
+import org.apache.commons.io.IOUtils;
import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
@@ -35,11 +36,13 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
/**
* Factory that creates and starts pre-configured instances of Infinispan.
@@ -56,6 +59,7 @@
public static final String INFINISPAN_CONFIG = "infinispan-configuration";
+ private final ConfigurationManager configurationManager;
private final TemplateConfigurationHelper configurationHelper;
private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.InfinispanCacheFactory");
@@ -75,6 +79,7 @@
*/
public ISPNCacheFactory(ConfigurationManager configurationManager)
{
+ this.configurationManager = configurationManager;
this.configurationHelper = new ISPNCacheHelper(configurationManager);
}
@@ -119,7 +124,9 @@
{
public EmbeddedCacheManager run() throws IOException
{
- return getUniqueInstance(regionIdEscaped, new DefaultCacheManager(configStream));
+ DefaultCacheManager manager = new DefaultCacheManager(configStream, false);
+ loadJGroupsConfig(manager);
+ return getUniqueInstance(regionIdEscaped, manager);
}
});
@@ -142,6 +149,48 @@
}
/**
+ * This method is used to load the file corresponding to the path set on the property
+ * <tt>configurationFile</tt> using the configuration manager, then set the XML content
+ * as value of the property <tt>configurationXml</tt>.
+ * @param manager the manager from which we extract the transport properties in which
+ * we will find the path of the JGroups configuration
+ * @throws IOException if the configuration file cannot be read
+ */
+ private void loadJGroupsConfig(DefaultCacheManager manager) throws IOException
+ {
+ Properties p = manager.getGlobalConfiguration().getTransportProperties();
+ if (p != null && p.containsKey("configurationFile"))
+ {
+ URL jgroupsConfigURL = null;
+ InputStream jgroupsConfigInputStream = null;
+ try
+ {
+ // Trying to get the configuration from the configuration manager
+ String configurationFile = p.getProperty("configurationFile");
+ jgroupsConfigInputStream = configurationManager.getInputStream(configurationFile);
+ jgroupsConfigURL = configurationManager.getResource(configurationFile);
+ }
+ catch (Exception e)
+ {
+ // ignore me
+ }
+ if (jgroupsConfigInputStream != null)
+ {
+ try
+ {
+ log.info("Custom JGroups configuration set: " + jgroupsConfigURL);
+ p.setProperty("configurationXml", IOUtils.toString(jgroupsConfigInputStream));
+ p.remove("configurationFile");
+ }
+ finally
+ {
+ jgroupsConfigInputStream.close();
+ }
+ }
+ }
+ }
+
+ /**
* Try to find if a {@link EmbeddedCacheManager} of the same type (i.e. their {@link GlobalConfiguration} are equals)
* has already been registered for the same current container.
* If no cache manager has been registered, we register the given cache manager otherwise we
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-03-25 15:13:50 UTC (rev 4176)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-03-25 16:21:35 UTC (rev 4177)
@@ -55,7 +55,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -64,7 +64,7 @@
<property name="index-dir" value="target/temp/index/db1/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -113,7 +113,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -121,7 +121,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1/ws1" />
@@ -139,7 +139,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -179,7 +179,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -187,7 +187,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1/ws2" />
@@ -205,7 +205,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -268,7 +268,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -276,7 +276,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1/ws3" />
@@ -294,7 +294,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -351,7 +351,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -359,7 +359,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db2/ws" />
@@ -369,7 +369,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -415,7 +415,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -423,7 +423,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db2/ws1" />
@@ -433,7 +433,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -490,7 +490,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -498,7 +498,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1tck/ws" />
@@ -517,7 +517,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -564,7 +564,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -572,7 +572,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
@@ -590,7 +590,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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" />
@@ -637,7 +637,7 @@
class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache">
<properties>
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
</properties>
</cache>
@@ -645,7 +645,7 @@
<properties>
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="infinispan-cluster-name" value="JCR-cluster" />
<property name="max-volatile-time" value="60" />
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
@@ -666,7 +666,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" />
- <property name="jgroups-configuration" value="flush-udp.xml" />
+ <property name="jgroups-configuration" value="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/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2011-03-25 15:13:50 UTC (rev 4176)
+++ jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2011-03-25 16:21:35 UTC (rev 4177)
@@ -22,8 +22,7 @@
addDependency(new Project("jcr", "jcr", "jar", "1.0")).
addDependency(new Project("concurrent", "concurrent", "jar", "1.3.4")).
addDependency(new Project("org.jgroups", "jgroups", "jar", "2.11.1.Final")).
-// addDependency(new Project("stax", "stax-api", "jar", "1.0")).
-// addDependency(new Project("stax", "stax", "jar", "1.2.0")).
+ addDependency(new Project("commons-io", "commons-io", "jar", "1.3.2")).
addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.6.GA")).
addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4176 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-25 11:13:50 -0400 (Fri, 25 Mar 2011)
New Revision: 4176
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java
Log:
EXOJCR-1027: wait while all testing threads are finished
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2011-03-25 11:36:59 UTC (rev 4175)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2011-03-25 15:13:50 UTC (rev 4176)
@@ -136,10 +136,15 @@
}
// should be enough to finish all the threads
- Thread.sleep(4000);
+ Thread.sleep(1000);
for (int i = 0; i < 10; i++)
{
+ p[i].join();
+ }
+
+ for (int i = 0; i < 10; i++)
+ {
assertEquals(100 * 100, p[i].getLen());
}
}
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4175 - kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-25 07:36:59 -0400 (Fri, 25 Mar 2011)
New Revision: 4175
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Deserializer.java
kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/default-settings.properties
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/settings.properties
Log:
EXOJCR-1269: Allow to set a default value when we use variables in configuration files.
The syntax ${variable-name:default-value} is now supported.
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-03-25 10:18:03 UTC (rev 4174)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-03-25 11:36:59 UTC (rev 4175)
@@ -1720,6 +1720,20 @@
</section>
<section>
+ <title>Variable Syntaxes</title>
+
+ <para>All the variables that we described in the previous chapters can be
+ defined thanks to 2 possible syntaxes which are
+ <emphasis>${variable-name}</emphasis> or
+ <emphasis>${variable-name:default-value}</emphasis>. The first syntax
+ doesn't define any default value so if the variable has not be set the
+ value will be <emphasis>${variable-name}</emphasis> to indicate that it
+ could not be resolved. The second syntax allows you to define the default
+ value after the semi colon so if the variable has not be set the value
+ will be the given default value.</para>
+ </section>
+
+ <section>
<title>Runtime configuration profiles</title>
<para>The kernel configuration is able to handle configuration profiles at
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Deserializer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Deserializer.java 2011-03-25 10:18:03 UTC (rev 4174)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Deserializer.java 2011-03-25 11:36:59 UTC (rev 4175)
@@ -203,7 +203,7 @@
if (input == null)
return input;
char[] chars = input.toCharArray();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
boolean properties = false;
int state = NORMAL;
int start = 0;
@@ -230,6 +230,13 @@
{
String value = null;
String key = input.substring(start + 2, i);
+ String defaultValue = null;
+ int index = key.indexOf(':');
+ if (index > -1)
+ {
+ defaultValue = key.substring(index + 1);
+ key = key.substring(0, index);
+ }
if (key.equals(Deserializer.EXO_CONTAINER_PROP_NAME))
{
// The requested key is the name of current container
@@ -269,6 +276,10 @@
value = PrivilegedSystemHelper.getProperty(key);
}
}
+ if (value == null && defaultValue != null)
+ {
+ value = defaultValue;
+ }
if (value != null)
{
properties = true;
Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2011-03-25 10:18:03 UTC (rev 4174)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/definition/TestPortalContainerConfig.java 2011-03-25 11:36:59 UTC (rev 4175)
@@ -1626,6 +1626,22 @@
assertEquals("-property_value_1-", config.getSetting("foo", "complex-value9"));
assertEquals("-property_value_1-", config.getSetting("myPortal", "complex-value9"));
assertEquals("-property_value_1-", config.getSetting("myPortal-pcdef", "complex-value9"));
+ assertNull(config.getSetting("foo", "complex-value10"));
+ assertNull(config.getSetting("myPortal", "complex-value10"));
+ assertEquals("--value--", config.getSetting("myPortal-pcdef", "complex-value10"));
+ assertNull(config.getSetting("foo", "complex-value11"));
+ assertNull(config.getSetting("myPortal", "complex-value11"));
+ assertEquals("-default-", config.getSetting("myPortal-pcdef", "complex-value11"));
+ assertEquals("-default-", config.getSetting("foo", "complex-value12"));
+ assertEquals("-default-", config.getSetting("myPortal", "complex-value12"));
+ assertEquals("-value-", config.getSetting("myPortal-pcdef", "complex-value12"));
+ assertEquals("-property_value_1-", config.getSetting("foo", "complex-value13"));
+ assertEquals("-property_value_1-", config.getSetting("myPortal", "complex-value13"));
+ assertEquals("-property_value_1-", config.getSetting("myPortal-pcdef", "complex-value13"));
+ assertEquals("-default-", config.getSetting("foo", "complex-value14"));
+ assertEquals("-default-", config.getSetting("myPortal", "complex-value14"));
+ assertEquals("-default-", config.getSetting("myPortal-pcdef", "complex-value14"));
+
assertEquals("-system value-", config.getSetting("foo", "cpv1"));
assertEquals("-system value-", config.getSetting("myPortal", "cpv1"));
assertEquals("-system value-", config.getSetting("myPortal-pcdef", "cpv1"));
@@ -1635,6 +1651,12 @@
assertEquals("-property_value_1-", config.getSetting("foo", "cpv3"));
assertEquals("-property_value_1-", config.getSetting("myPortal", "cpv3"));
assertEquals("-property_value_1-", config.getSetting("myPortal-pcdef", "cpv3"));
+ assertEquals("-value-", config.getSetting("foo", "cpv4"));
+ assertEquals("-value-", config.getSetting("myPortal", "cpv4"));
+ assertEquals("-value-", config.getSetting("myPortal-pcdef", "cpv4"));
+ assertEquals("-system value-", config.getSetting("foo", "cpv5"));
+ assertEquals("-system value-", config.getSetting("myPortal", "cpv5"));
+ assertEquals("-system value-", config.getSetting("myPortal-pcdef", "cpv5"));
assertEquals("new value0", config.getSetting("foo", "string"));
assertEquals(new Integer(200), config.getSetting("foo", "int"));
assertEquals(new Integer(60), config.getSetting("foo", "int2"));
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/default-settings.properties
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/default-settings.properties 2011-03-25 10:18:03 UTC (rev 4174)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/default-settings.properties 2011-03-25 11:36:59 UTC (rev 4175)
@@ -10,4 +10,7 @@
complex-value3=-${foo3}-
complex-value5=-${foo5}-
complex-value8=-${foo6}-
-complex-value9=-${property_String}-
\ No newline at end of file
+complex-value9=-${property_String}-
+complex-value12=-${foo6:default}-
+complex-value13=-${property_String:default}-
+complex-value14=-${complex-value-unknown:default}-
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml 2011-03-25 10:18:03 UTC (rev 4174)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/portal-container-config-with-default-values-and-with-both-settings-with-default-portal-def.xml 2011-03-25 11:36:59 UTC (rev 4175)
@@ -62,6 +62,22 @@
</entry>
<entry>
<key>
+ <string>cpv4</string>
+ </key>
+ <value>
+ <string>-${property2_String:value}-</string>
+ </value>
+ </entry>
+ <entry>
+ <key>
+ <string>cpv5</string>
+ </key>
+ <value>
+ <string>-${TestPortalContainerConfig-string:value}-</string>
+ </value>
+ </entry>
+ <entry>
+ <key>
<string>foo2</string>
</key>
<value>
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/settings.properties
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/settings.properties 2011-03-25 10:18:03 UTC (rev 4174)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/definition/settings.properties 2011-03-25 11:36:59 UTC (rev 4175)
@@ -8,4 +8,6 @@
complex-value=${name}-${rest}-${realm}-${foo2}-${string}
complex-value4=-${foo4}-
complex-value6=-${foo6}-
-complex-value7=-${foo5}-
\ No newline at end of file
+complex-value7=-${foo5}-
+complex-value10=-${complex-value7:default}-
+complex-value11=-${complex-value-unknown:default}-
\ No newline at end of file
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4174 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-25 06:18:03 -0400 (Fri, 25 Mar 2011)
New Revision: 4174
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
Log:
EXOJCR-1233: we start first with the config with the biggest priority to the lowest.
So it will be first extensions, then normal config and then config from DB
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-03-25 08:50:43 UTC (rev 4173)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-03-25 10:18:03 UTC (rev 4174)
@@ -283,33 +283,42 @@
{
try
{
- if (configurationPersister != null && configurationPersister.hasConfig())
+ // Start from extensions first
+ String[] paths = configExtensionPaths.toArray(new String[configExtensionPaths.size()]);
+ for (int i = paths.length - 1; i >= 0; i--)
{
- init(configurationPersister.read());
- merge(configurationService.getInputStream(param.getValue()));
+ // We start from the last one because as it is the one with highest priority
+ if (i == paths.length - 1)
+ {
+ init(configurationService.getInputStream(paths[i]));
+ }
+ else
+ {
+ merge(configurationService.getInputStream(paths[i]));
+ }
}
- else
+
+ // Then from normal config
+ if (configExtensionPaths.isEmpty())
{
init(configurationService.getInputStream(param.getValue()));
}
+ else
+ {
+ merge(configurationService.getInputStream(param.getValue()));
+ }
- // Will be merged extension repository configuration
- if (!configExtensionPaths.isEmpty())
+ // Then from config from persister
+ if (configurationPersister != null)
{
- // We start from the last one because as it is the one with highest priority
- String[] paths = configExtensionPaths.toArray(new String[configExtensionPaths.size()]);
- for (int i = paths.length - 1; i >= 0; i--)
+ if (configurationPersister.hasConfig())
{
- merge(configurationService.getInputStream(paths[i]));
+ merge(configurationPersister.read());
}
- }
- // Store the merged configuration
- if (configurationPersister != null)
- {
+ // Store the merged configuration
retain();
}
-
}
catch (RepositoryConfigurationException e)
{
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4173 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-25 04:50:43 -0400 (Fri, 25 Mar 2011)
New Revision: 4173
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
Log:
EXOJCR-1272: the big batch commit in RDMBS restore failed on Oracle
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-25 07:41:56 UTC (rev 4172)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-25 08:50:43 UTC (rev 4173)
@@ -66,6 +66,11 @@
public class DBRestor implements DataRestor
{
/**
+ * The maximum possible batch size.
+ */
+ private final int MAXIMUM_BATCH_SIZE = 1000;
+
+ /**
* List of temporary files.
*/
private final List<File> spoolFileList = new ArrayList<File>();
@@ -366,6 +371,10 @@
parameters += "?" + (i == targetColumnCount - 1 ? "" : ",");
}
+ int batchSize = 0;
+ insertNode =
+ jdbcConn.prepareStatement("INSERT INTO " + tableName + " (" + names + ") VALUES(" + parameters + ")");
+
// set data
outer : while (true)
{
@@ -406,13 +415,6 @@
stream = len == -1 ? null : spoolInputStream(contentReader, len);
}
- if (insertNode == null)
- {
- insertNode =
- jdbcConn.prepareStatement("INSERT INTO " + tableName + " (" + names + ") VALUES(" + parameters
- + ")");
- }
-
if (restoreRule.getSkipColumnIndex() != null && restoreRule.getSkipColumnIndex() == i)
{
targetIndex--;
@@ -529,13 +531,18 @@
insertNode.setNull(targetIndex + 1, columnType.get(i));
}
}
- if (insertNode != null)
+
+ // add statement to batch
+ insertNode.addBatch();
+
+ if (++batchSize == MAXIMUM_BATCH_SIZE)
{
- insertNode.addBatch();
+ insertNode.executeBatch();
+ batchSize = 0;
}
}
- if (insertNode != null)
+ if (batchSize != 0)
{
insertNode.executeBatch();
}
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4172 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-25 03:41:56 -0400 (Fri, 25 Mar 2011)
New Revision: 4172
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
Log:
EXOJCR-1233: first merge from base configuration
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-03-25 07:10:50 UTC (rev 4171)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-03-25 07:41:56 UTC (rev 4172)
@@ -283,50 +283,33 @@
{
try
{
- if ((configurationPersister != null && configurationPersister.hasConfig()))
+ if (configurationPersister != null && configurationPersister.hasConfig())
{
- initFromStream(configurationService.getInputStream(param.getValue()));
-
- // Will be merged extension repository configuration with configuration from persister.
- if (!configExtensionPaths.isEmpty())
- {
- String[] paths = configExtensionPaths.toArray(new String[configExtensionPaths.size()]);
- for (int i = paths.length - 1; i >= 0; i--)
- {
- merge(configurationService.getInputStream(paths[i]));
- }
- }
+ init(configurationPersister.read());
merge(configurationService.getInputStream(param.getValue()));
-
- // Store the merged configuration
- if (configurationPersister != null)
- {
- retain();
- }
}
else
{
+ init(configurationService.getInputStream(param.getValue()));
+ }
+ // Will be merged extension repository configuration
+ if (!configExtensionPaths.isEmpty())
+ {
+ // We start from the last one because as it is the one with highest priority
String[] paths = configExtensionPaths.toArray(new String[configExtensionPaths.size()]);
for (int i = paths.length - 1; i >= 0; i--)
{
- // We start from the last one because as it is the one with highest priorityn
- if (i == paths.length - 1)
- {
- init(configurationService.getInputStream(paths[i]));
- }
- else
- {
- merge(configurationService.getInputStream(paths[i]));
- }
+ merge(configurationService.getInputStream(paths[i]));
}
- merge(configurationService.getInputStream(param.getValue()));
- // Store the merged configuration
- if (configurationPersister != null && !configurationPersister.hasConfig())
- {
- retain();
- }
}
+
+ // Store the merged configuration
+ if (configurationPersister != null)
+ {
+ retain();
+ }
+
}
catch (RepositoryConfigurationException e)
{
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4171 - in jcr/trunk: exo.jcr.component.ext and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-25 03:10:50 -0400 (Fri, 25 Mar 2011)
New Revision: 4171
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java
Log:
EXOJCR-1270: clean components before restoring
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java 2011-03-24 16:15:17 UTC (rev 4170)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DirectoryRestor.java 2011-03-25 07:10:50 UTC (rev 4171)
@@ -101,11 +101,14 @@
try
{
File tmpDir = new File(tempDir, PREFIX + IdGenerator.generate());
- DirectoryHelper.copyDirectory(dataDir, tmpDir);
-
+ PrivilegedFileHelper.mkdirs(tmpDir);
tmpDirs.add(tmpDir);
- DirectoryHelper.removeDirectory(dataDir);
+ if (PrivilegedFileHelper.exists(dataDir))
+ {
+ DirectoryHelper.copyDirectory(dataDir, tmpDir);
+ DirectoryHelper.removeDirectory(dataDir);
+ }
}
catch (IOException e)
{
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-24 16:15:17 UTC (rev 4170)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-25 07:10:50 UTC (rev 4171)
@@ -141,7 +141,7 @@
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.3-606.jdbc3</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-03-24 16:15:17 UTC (rev 4170)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-03-25 07:10:50 UTC (rev 4171)
@@ -140,6 +140,11 @@
for (DataRestor restorer : dataRestorers)
{
+ restorer.clean();
+ }
+
+ for (DataRestor restorer : dataRestorers)
+ {
restorer.restore();
}
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4170 - in jcr/trunk: applications/product-patches/as/jetty and 10 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-24 12:15:17 -0400 (Thu, 24 Mar 2011)
New Revision: 4170
Added:
jcr/trunk/applications/product-patches/as/jetty/exo-conf/
jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-config.xml
jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-ispn-config.xml
jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-jbc-config.xml
jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt
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
jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt
jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
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
Modified:
jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
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/bin/eXo.bat
jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh
jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml
Log:
EXOJCR-1260: Profiles "jbc" and "ispn" have been added in the configuration and the batches, now for jetty, jonas and tomcat you can specify which config type you want to use thanks to a new parameter. By default we use the default config, if the value of the paramater is "ispn", the config for Infinispan is used and if the value of the paramater is "jbc", the config for JBoss Cache is used. For more details read the exo-readme.txt for each AS.
Modified: jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -19,8 +19,8 @@
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_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+<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">
<!-- will use JBoss logger, or enable eXo logger and run JBoss with -Dorg.jboss.logging.Log4jService.catchSystemOut=false -->
<!-- component>
@@ -60,6 +60,16 @@
<description>JCR configuration file</description>
<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>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>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
+ </value-param>
</init-params>
</component>
@@ -168,7 +178,40 @@
</object-param>
</init-params>
</component>
+ <component profiles="ispn,jbc">
+ <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>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>3000</value>
+ </value-param>
+ </init-params>
+ </component>
+ <component profiles="ispn,jbc">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/portal/cluster/udp-mux.xml</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-cluster-name</name>
+ <value>RPCService-Cluster</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-default-timeout</name>
+ <value>0</value>
+ </value-param>
+ </init-params>
+ </component>
<component>
<type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
<init-params>
Modified: jcr/trunk/applications/product-patches/as/jetty/eXo.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/eXo.bat 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jetty/eXo.bat 2011-03-24 16:15:17 UTC (rev 4170)
@@ -1 +1 @@
-java -Djava.security.auth.login.config=jaas.conf -jar start.jar
+java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true -jar start.jar
Modified: jcr/trunk/applications/product-patches/as/jetty/eXo.sh
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/eXo.sh 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jetty/eXo.sh 2011-03-24 16:15:17 UTC (rev 4170)
@@ -1 +1 @@
-java -Djava.security.auth.login.config=jaas.conf -jar start.jar
+java -Djava.security.auth.login.config=jaas.conf -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -jar start.jar
Added: jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-config.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-config.xml (rev 0)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,169 @@
+<!--
+
+ 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>
Added: jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-ispn-config.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-ispn-config.xml (rev 0)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-ispn-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,214 @@
+<!--
+
+ 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>
Added: jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-jbc-config.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-jbc-config.xml (rev 0)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-conf/exo-jcr-jbc-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,235 @@
+<!--
+
+ 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/jetty/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -19,8 +19,8 @@
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_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+<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">
<component>
<key>org.exoplatform.services.log.LogConfigurationInitializer</key>
@@ -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="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,8 +58,18 @@
<value-param>
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-config.xml</value>
+ <value>exo-conf/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-param>
+ <value-param profiles="jbc">
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>exo-conf/exo-jcr-jbc-config.xml</value>
+ </value-param>
</init-params>
</component>
@@ -168,7 +178,40 @@
</object-param>
</init-params>
</component>
+ <component profiles="ispn,jbc">
+ <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>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>3000</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component profiles="ispn,jbc">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/portal/cluster/udp-mux.xml</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-cluster-name</name>
+ <value>RPCService-Cluster</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-default-timeout</name>
+ <value>0</value>
+ </value-param>
+ </init-params>
+ </component>
<component>
<type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
<init-params>
@@ -257,7 +300,7 @@
</value-param>
<value-param>
<name>cache-folder-name</name>
- <value>../temp/ftp_cache</value>
+ <value>temp/ftp_cache</value>
</value-param>
<!-- bytes per second -->
@@ -316,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:temp/data/exodb" />
<property name="username" value="sa" />
<property name="password" value="" />
</properties-param>
Added: jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt (rev 0)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-readme.txt 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,15 @@
+Thank you for your interest in eXo JCR
+
+To launch it, execute the following command:
+
+In Unix environment
+
+* "./eXo.sh" to launch eXo JCR with the default configuration
+* "./eXo.sh ispn" to launch eXo JCR with the configuration for Infinispan
+* "./eXo.sh jbc" to launch eXo JCR with the configuration for JBoss Cache
+
+In Windows environment
+
+* "eXo.bat" to launch eXo JCR with the default configuration
+* "eXo.bat ispn" to launch eXo JCR with the configuration for Infinispan
+* "eXo.bat jbc" to launch eXo JCR with the configuration for JBoss Cache
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-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jonas/bin/nt/jonas.bat 2011-03-24 16:15:17 UTC (rev 4170)
@@ -80,8 +80,11 @@
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
-set JAVA_OPTS=%JAVA_OPTS% -Xmx512M
+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 JAVA_OPTS=%JAVA_OPTS% -Xmx512M
+if ""%1"" == ""jbc"" shift
+if ""%1"" == ""ispn"" shift
+
Rem ------------------------ End eXo configuration -----------------------------
Rem ---------------------------------------------
Modified: jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas 2011-03-24 16:15:17 UTC (rev 4170)
@@ -79,8 +79,12 @@
# ------------------------- 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"
+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"
JAVA_OPTS="$JAVA_OPTS -Xmx512M"
+if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
+ shift
+fi
+
# -------------------------- End eXo configuration -----------------------------
# ---------------------------------------------
Added: 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 (rev 0)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,169 @@
+<!--
+
+ 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>
Added: 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 (rev 0)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-ispn-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,214 @@
+<!--
+
+ 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>
Added: 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 (rev 0)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-conf/exo-jcr-jbc-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,235 @@
+<!--
+
+ 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-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -19,8 +19,8 @@
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_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+<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">
<component>
<key>org.exoplatform.services.log.LogConfigurationInitializer</key>
@@ -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="../../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,8 +58,18 @@
<value-param>
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/portal/exo-jcr-config.xml</value>
+ <value>exo-conf/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-param>
+ <value-param profiles="jbc">
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>exo-conf/exo-jcr-jbc-config.xml</value>
+ </value-param>
</init-params>
</component>
@@ -168,7 +178,40 @@
</object-param>
</init-params>
</component>
+ <component profiles="ispn,jbc">
+ <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>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>3000</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component profiles="ispn,jbc">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/portal/cluster/udp-mux.xml</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-cluster-name</name>
+ <value>RPCService-Cluster</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-default-timeout</name>
+ <value>0</value>
+ </value-param>
+ </init-params>
+ </component>
<component>
<type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
<init-params>
@@ -257,7 +300,7 @@
</value-param>
<value-param>
<name>cache-folder-name</name>
- <value>../temp/ftp_cache</value>
+ <value>../../temp/ftp_cache</value>
</value-param>
<!-- bytes per second -->
@@ -316,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:../../temp/data/exodb" />
<property name="username" value="sa" />
<property name="password" value="" />
</properties-param>
Added: jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt (rev 0)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-readme.txt 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,13 @@
+Thank you for your interest in eXo JCR
+
+In Unix environment, go in the directory bin/unix then execute the following command:
+
+* "./jonas start" to launch eXo JCR with the default configuration
+* "./jonas ispn start" to launch eXo JCR with the configuration for Infinispan
+* "./jonas jbc start" to launch eXo JCR with the configuration for JBoss Cache
+
+In Windows environment, go in the directory bin\nt then execute the following command:
+
+* "jonas.bat start" to launch eXo JCR with the default configuration
+* "jonas.bat ispn start" to launch eXo JCR with the configuration for Infinispan
+* "jonas.bat jbc start" to launch eXo JCR with the configuration for JBoss Cache
Modified: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.bat 2011-03-24 16:15:17 UTC (rev 4170)
@@ -8,9 +8,11 @@
rem Sets some variables
set LOG_OPTS="-Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog"
set SECURITY_OPTS="-Djava.security.auth.login.config=%TOMCAT_HOME%\conf\jaas.conf"
-set EXO_OPTS="-Dexo.product.developing=true"
+set EXO_OPTS=-Dexo.product.developing=true -Dexo.profiles=%1 -Djava.net.preferIPv4Stack=true
set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%
+if ""%1"" == ""jbc"" shift
+if ""%1"" == ""ispn"" shift
rem Launches the server
cd %BIN_DIR%
-call catalina.bat %*
\ No newline at end of file
+call catalina.bat %1 %2 %3
Modified: jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/tomcat/bin/eXo.sh 2011-03-24 16:15:17 UTC (rev 4170)
@@ -5,12 +5,11 @@
PRGDIR=`dirname "$PRG"`
LOG_OPTS="-Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=$PRGDIR/../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=true"
+EXO_OPTS="-Dexo.product.developing=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true"
+if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
+ shift
+fi
-#DYLD_LIBRARY_PATH="/Users/tuannguyen/Desktop/YourKit.app/bin/mac/"
-#export DYLD_LIBRARY_PATH
-#YOURKIT_PROFILE_OPTION="-agentlib:yjpagent"
-
-JAVA_OPTS="$YOURKIT_PROFILE_OPTION $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
+JAVA_OPTS="$JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
export JAVA_OPTS
exec "$PRGDIR"/catalina.sh "$@"
Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -19,8 +19,8 @@
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_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+<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">
<component>
<key>org.exoplatform.services.log.LogConfigurationInitializer</key>
@@ -60,6 +60,16 @@
<description>JCR configuration file</description>
<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>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>jar:/conf/portal/exo-jcr-jbc-config.xml</value>
+ </value-param>
</init-params>
</component>
@@ -168,7 +178,40 @@
</object-param>
</init-params>
</component>
-
+ <component profiles="ispn,jbc">
+ <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>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>3000</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <component profiles="ispn,jbc">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/portal/cluster/udp-mux.xml</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-cluster-name</name>
+ <value>RPCService-Cluster</value>
+ </value-param>
+ <value-param>
+ <name>jgroups-default-timeout</name>
+ <value>0</value>
+ </value-param>
+ </init-params>
+ </component>
<component>
<type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
<init-params>
Added: jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt (rev 0)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,15 @@
+Thank you for your interest in eXo JCR
+
+To launch it, go to the bin directory and execute the following command:
+
+In Unix environment
+
+* "./eXo.sh run" to launch eXo JCR with the default configuration
+* "./eXo.sh ispn run" to launch eXo JCR with the configuration for Infinispan
+* "./eXo.sh jbc run" to launch eXo JCR with the configuration for JBoss Cache
+
+In Windows environment
+
+* "eXo.bat run" to launch eXo JCR with the default configuration
+* "eXo.bat ispn run" to launch eXo JCR with the configuration for Infinispan
+* "eXo.bat jbc run" to launch eXo JCR with the configuration for JBoss Cache
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/udp-mux.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -61,5 +61,5 @@
<FRAG2 frag_size="60000" />
<!--pbcast.STREAMING_STATE_TRANSFER /-->
<pbcast.STATE_TRANSFER />
- <!-- pbcast.FLUSH /-->
+ <pbcast.FLUSH />
</config>
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-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -36,7 +36,7 @@
<property name="swap-directory" value="../temp/swap/production" />
</properties>
<value-storages>
- <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="production" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="../temp/values/production" />
</properties>
@@ -66,7 +66,7 @@
<time-out>15m</time-out>
<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
- <property name="path" value="../temp/lock/system" />
+ <property name="path" value="../temp/lock/production" />
</properties>
</persister>
</lock-manager>
@@ -82,7 +82,7 @@
<property name="swap-directory" value="../temp/swap/backup" />
</properties>
<value-storages>
- <value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="backup" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="../temp/values/backup" />
</properties>
@@ -108,6 +108,14 @@
<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">
@@ -146,6 +154,14 @@
<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>
Added: 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 (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,214 @@
+<!--
+
+ 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>
Added: 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 (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -0,0 +1,235 @@
+<!--
+
+ 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/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml 2011-03-24 15:51:00 UTC (rev 4169)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml 2011-03-24 16:15:17 UTC (rev 4170)
@@ -61,5 +61,5 @@
<FRAG2 frag_size="60000" />
<!--pbcast.STREAMING_STATE_TRANSFER /-->
<pbcast.STATE_TRANSFER />
- <!-- pbcast.FLUSH /-->
+ <pbcast.FLUSH />
</config>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4169 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-24 11:51:00 -0400 (Thu, 24 Mar 2011)
New Revision: 4169
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
Log:
EXOJCR-1233: JCR configuration update dont' require dropping JCR_CONFIG table
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-03-23 15:25:27 UTC (rev 4168)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-03-24 15:51:00 UTC (rev 4169)
@@ -295,12 +295,14 @@
{
merge(configurationService.getInputStream(paths[i]));
}
- // Store the merged configuration
- if (configurationPersister != null)
- {
- retain();
- }
}
+ merge(configurationService.getInputStream(param.getValue()));
+
+ // Store the merged configuration
+ if (configurationPersister != null)
+ {
+ retain();
+ }
}
else
{
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4168 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-03-23 11:25:27 -0400 (Wed, 23 Mar 2011)
New Revision: 4168
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java
Log:
EXOJCR-1234: SingleDbJDBCConnection.findLastOrderNumberByParentIdentifier fixed
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-03-23 15:10:46 UTC (rev 4167)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-03-23 15:25:27 UTC (rev 4168)
@@ -327,7 +327,8 @@
else
findLastOrderNumberByParentId.clearParameters();
- findLastOrderNumberByParentId.setString(1, parentIdentifier);
+ findLastOrderNumberByParentId.setString(1, containerName);
+ findLastOrderNumberByParentId.setString(2, parentIdentifier);
return findLastOrderNumberByParentId.executeQuery();
}
15 years, 1 month
- 1
- 0