Author: dkuleshov
Date: 2012-03-22 09:27:52 -0400 (Thu, 22 Mar 2012)
New Revision: 5940
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml
Removed:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml
Modified:
jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml
jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml
jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration-ijdbc-ispn.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/RepositoryServiceConfiguration.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
Log:
EXOJCR-1739: ported issues:
* EXOJCR-1726
* EXOJCR-1737
* EXOJCR-1742
* EXOJCR-1746
* EXOJCR-1753
Modified: jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++ jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd
http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
@@ -204,7 +204,7 @@
</init-params>
</component>
- <component profiles="ispn,jbc">
+ <component profiles="jbc">
<key>org.exoplatform.services.rpc.RPCService</key>
<type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
<init-params>
@@ -222,6 +222,26 @@
</value-param>
</init-params>
</component>
+
+ <component profiles="ispn">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/udp-mux-v3.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>
@@ -353,9 +373,9 @@
<type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
</component>
- <component>
- <key>org.exoplatform.services.security.Authenticator</key>
-
<type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+
<type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
</component>
<component>
Modified: jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -204,7 +204,7 @@
</init-params>
</component>
- <component profiles="ispn,jbc">
+ <component profiles="jbc">
<key>org.exoplatform.services.rpc.RPCService</key>
<type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
<init-params>
@@ -222,6 +222,26 @@
</value-param>
</init-params>
</component>
+
+ <component profiles="ispn">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/udp-mux-v3.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/jonas/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -204,7 +204,7 @@
</init-params>
</component>
- <component profiles="ispn,jbc">
+ <component profiles="jbc">
<key>org.exoplatform.services.rpc.RPCService</key>
<type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
<init-params>
@@ -222,6 +222,26 @@
</value-param>
</init-params>
</component>
+
+ <component profiles="ispn">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/udp-mux-v3.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/tomcat/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-
--->
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd
http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
@@ -220,7 +220,7 @@
</init-params>
</component>
- <component profiles="ispn,jbc">
+ <component profiles="jbc">
<key>org.exoplatform.services.rpc.RPCService</key>
<type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
<init-params>
@@ -238,6 +238,26 @@
</value-param>
</init-params>
</component>
+
+ <component profiles="ispn">
+ <key>org.exoplatform.services.rpc.RPCService</key>
+ <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>jgroups-configuration</name>
+ <value>jar:/conf/udp-mux-v3.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>
@@ -369,9 +389,9 @@
<type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
</component>
- <component>
- <key>org.exoplatform.services.security.Authenticator</key>
-
<type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+
<type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
</component>
<component>
Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2012-03-22 12:18:56
UTC (rev 5939)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2012-03-22 13:27:52
UTC (rev 5940)
@@ -11,3 +11,8 @@
* "eXo-ispn.bat run" to launch eXo JCR with the configuration for Infinispan
* "eXo-jbc.bat run" to launch eXo JCR with the configuration for JBoss Cache
+
+Notice!
+JCR Bundles for Infinispan and JBoss Cache differs by their dependencies.
+In ordrer to run eXo JCR with Infinispan configuration it must be deployed
+with "ispn" profile.
\ No newline at end of file
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/RepositoryServiceConfiguration.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/RepositoryServiceConfiguration.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/RepositoryServiceConfiguration.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -19,12 +19,21 @@
package org.exoplatform.services.jcr.config;
import org.exoplatform.commons.utils.SecurityHelper;
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
+import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import org.jibx.runtime.BindingDirectory;
import org.jibx.runtime.IBindingFactory;
+import org.jibx.runtime.IMarshallingContext;
import org.jibx.runtime.IUnmarshallingContext;
import org.jibx.runtime.JiBXException;
+import java.io.IOException;
import java.io.InputStream;
+import java.io.StringWriter;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.LinkedHashMap;
@@ -40,9 +49,11 @@
* @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady
Azarenkov </a>
* @version $Id: RepositoryServiceConfiguration.java 2038 2005-10-05 16:50:11Z geaz $
*/
-
+@Managed
+@NameTemplate(@Property(key = "service", value =
"RepositoryServiceConfiguration"))
public class RepositoryServiceConfiguration extends
AbstractRepositoryServiceConfiguration
{
+ private static final Log LOG =
ExoLogger.getLogger("exo.jcr.component.core.RepositoryServiceConfiguration");
//NOSONAR
public RepositoryServiceConfiguration()
{
@@ -180,4 +191,37 @@
{
}
+ @Managed
+ @ManagedDescription("The configuration of all the repositories in XML
format.")
+ public String getConfigurationXML()
+ {
+ StringWriter sw = new StringWriter();
+ try
+ {
+ IBindingFactory bfact =
BindingDirectory.getFactory(RepositoryServiceConfiguration.class);
+ IMarshallingContext mctx = bfact.createMarshallingContext();
+ mctx.setIndent(2);
+ mctx.marshalDocument(this, "UTF-8", null, sw);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot convert the configuration to XML format", e);
+ return null;
+ }
+ finally
+ {
+ try
+ {
+ sw.close();
+ }
+ catch (IOException ignore)
+ {
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace("An exception occurred: " + ignore.getMessage());
+ }
+ }
+ }
+ return sw.toString();
+ }
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -168,6 +168,7 @@
setOnline();
break;
case ManageableRepository.OFFLINE :
+ suspend();
break;
case ManageableRepository.SUSPENDED :
suspend();
@@ -214,7 +215,10 @@
{
try
{
- component.suspend();
+ if (!component.isSuspended())
+ {
+ component.suspend();
+ }
}
catch (SuspendException e)
{
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -32,6 +32,7 @@
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
+import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.core.security.JCRRuntimePermissions;
@@ -487,6 +488,17 @@
@Override
public synchronized void stop()
{
+ RepositoryImpl repository =
(RepositoryImpl)getComponentInstanceOfType(RepositoryImpl.class);
+
+ try
+ {
+ repository.setState(ManageableRepository.OFFLINE);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Can not switch repository to OFFLINE", e);
+ }
+
super.stop();
super.unregisterAllComponents();
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -415,7 +415,6 @@
public SessionImpl getDynamicSession(String workspaceName,
Collection<MembershipEntry> membershipEntries)
throws RepositoryException
{
-
if (getState() == OFFLINE)
{
LOG.warn("Repository " + getName() + " is OFFLINE.");
@@ -743,10 +742,18 @@
throw new RepositoryException("First switch repository to ONLINE and then
to needed state.\n" + toString());
}
- // set state for all workspaces
- for (String workspaceName : getWorkspaceNames())
+ String[] workspaces = getWorkspaceNames();
+ if (workspaces.length > 0)
{
- getWorkspaceContainer(workspaceName).setState(state);
+ // set state for all workspaces
+ for (String workspaceName : workspaces)
+ {
+ if (!workspaceName.equals(systemWorkspaceName))
+ {
+ getWorkspaceContainer(workspaceName).setState(state);
+ }
+ }
+ getWorkspaceContainer(systemWorkspaceName).setState(state);
}
isOffline = state == OFFLINE;
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -1200,10 +1200,10 @@
*/
public void suspend() throws SuspendException
{
- isResponsibleForResuming = true;
-
if (rpcService != null)
{
+ isResponsibleForResuming = true;
+
try
{
rpcService.executeCommandOnAllNodes(suspend, true);
@@ -1274,13 +1274,13 @@
{
throw new ResumeException(e);
}
+
+ isResponsibleForResuming = false;
}
else
{
resumeLocally();
}
-
- isResponsibleForResuming = false;
}
/**
@@ -1541,32 +1541,29 @@
{
throw new SuspendException("Can't suspend index, while reindexing in
progeress.");
}
- if (isSuspended)
- {
- throw new SuspendException("Component already suspended.");
- }
- if (handler instanceof Suspendable)
+ if (!isSuspended)
{
- ((Suspendable)handler).suspend();
- }
+ if (handler instanceof Suspendable)
+ {
+ ((Suspendable)handler).suspend();
+ }
- isSuspended = true;
+ isSuspended = true;
+ }
}
protected void resumeLocally() throws ResumeException
{
- if (!isSuspended)
+ if (isSuspended)
{
- throw new ResumeException("Component is not suspended.");
- }
+ if (handler instanceof Suspendable)
+ {
+ ((Suspendable)handler).resume();
+ }
- if (handler instanceof Suspendable)
- {
- ((Suspendable)handler).resume();
+ isSuspended = false;
}
-
- isSuspended = false;
}
/**
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -960,6 +960,14 @@
finally
{
workingThreads.decrementAndGet();
+
+ if (isSuspended && workingThreads.get() == 0)
+ {
+ synchronized (workingThreads)
+ {
+ workingThreads.notifyAll();
+ }
+ }
}
}
@@ -1913,10 +1921,10 @@
*/
public void suspend() throws SuspendException
{
- isResponsibleForResuming = true;
-
if (rpcService != null)
{
+ isResponsibleForResuming = true;
+
try
{
rpcService.executeCommandOnAllNodes(suspend, true);
@@ -1955,13 +1963,13 @@
{
throw new ResumeException(e);
}
+
+ isResponsibleForResuming = false;
}
else
{
resumeLocally();
}
-
- isResponsibleForResuming = false;
}
/**
@@ -1974,36 +1982,41 @@
private void suspendLocally() throws SuspendException
{
- if (isSuspended)
+ if (!isSuspended)
{
- throw new SuspendException("Component already suspended.");
- }
+ latcher = new CountDownLatch(1);
+ isSuspended = true;
- latcher = new CountDownLatch(1);
- isSuspended = true;
-
- while (workingThreads.get() != 0)
- {
- try
+ if (workingThreads.get() > 0)
{
- Thread.sleep(50);
+ synchronized (workingThreads)
+ {
+ while (workingThreads.get() > 0)
+ {
+ try
+ {
+ workingThreads.wait();
+ }
+ catch (InterruptedException e)
+ {
+ if (LOG.isTraceEnabled())
+ {
+ LOG.trace(e.getMessage(), e);
+ }
+ }
+ }
+ }
}
- catch (InterruptedException e)
- {
- throw new SuspendException(e);
- }
}
}
private void resumeLocally() throws ResumeException
{
- if (!isSuspended)
+ if (isSuspended)
{
- throw new ResumeException("Component is not suspended.");
+ latcher.countDown();
+ isSuspended = false;
}
-
- latcher.countDown();
- isSuspended = false;
}
/**
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -37,7 +37,7 @@
{
private String wsId;
- ChangesKey()
+ public ChangesKey()
{
super();
}
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -30,7 +30,7 @@
*/
public class IndexInfosKey extends CacheKey
{
- IndexInfosKey()
+ public IndexInfosKey()
{
super();
}
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java 2012-03-22
13:27:52 UTC (rev 5940)
@@ -31,7 +31,7 @@
public class IndexUpdateKey extends CacheKey
{
- IndexUpdateKey()
+ public IndexUpdateKey()
{
super();
}
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
(rev 0)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd
http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+
xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
+ <component>
+ <type>org.exoplatform.services.ispn.DistributedCacheManager</type>
+ <init-params>
+ <value-param>
+ <name>infinispan-configuration</name>
+ <value>jar:/conf/distributed-cache-configuration.xml</value>
+ </value-param>
+ <properties-param>
+ <name>parameters</name>
+ <description>The parameters of the configuration</description>
+ <property name="configurationFile"
value="udp-mux-v3.xml"></property>
+ <property name="invalidationThreshold"
value="0"></property>
+ <property name="numOwners" value="2"></property>
+ <property name="numVirtualNodes"
value="1"></property>
+ </properties-param>
+ <properties-param profiles="tcp">
+ <name>parameters</name>
+ <description>The parameters of the configuration</description>
+ <property name="configurationFile"
value="tcp-mux-v3.xml"></property>
+ <property name="invalidationThreshold"
value="-1"></property>
+ <property name="numOwners" value="2"></property>
+ <property name="numVirtualNodes"
value="1"></property>
+ </properties-param>
+ </init-params>
+ </component>
+ <component>
+ <key>org.infinispan.transaction.lookup.TransactionManagerLookup</key>
+ <type>org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.transaction.TransactionService</key>
+ <type>org.exoplatform.services.transaction.infinispan.JBossTransactionsService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>3000</value>
+ </value-param>
+ </init-params>
+ </component>
+ <component>
+ <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
+ <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
+ <init-params>
+ <value-param>
+ <name>logger</name>
+ <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
+ </value-param>
+ <value-param>
+ <name>configurator</name>
+ <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
+ </value-param>
+ <properties-param>
+ <name>properties</name>
+ <description>Log4J properties</description>
+ <property name="log4j.rootLogger" value="INFO, stdout, file"
/>
+
+ <property name="log4j.appender.stdout"
value="org.apache.log4j.ConsoleAppender" />
+ <property name="log4j.appender.stdout.threshold" value="DEBUG"
/>
+
+ <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="jcr-cache-server.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" />
+ </properties-param>
+ </init-params>
+ </component>
+</configuration>
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml
(rev 0)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2010 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+
+-->
+<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:infinispan:config:5.1
http://www.infinispan.org/schemas/infinispan-config-5.1.xsd"
+ xmlns="urn:infinispan:config:5.1">
+ <global>
+ <globalJmxStatistics jmxDomain="exo" enabled="true"
allowDuplicateDomains="true"/>
+ <transport
transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"
clusterName="JCR-cluster" distributedSyncTimeout="20000">
+ <properties>
+ <property name="configurationFile"
value="${configurationFile}"/>
+ </properties>
+ </transport>
+ <shutdown hookBehavior="DEFAULT"/>
+ </global>
+ <namedCache name="JCRCache">
+ <locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="120000" writeSkewCheck="false"
concurrencyLevel="500" useLockStriping="true" />
+ <transaction
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"
eagerLockSingleNode="true" transactionMode="TRANSACTIONAL"/>
+ <jmxStatistics enabled="true"/>
+ <clustering mode="distribution">
+ <l1 enabled="true"
invalidationThreshold="${invalidationThreshold}"/>
+ <hash numOwners="${numOwners}"
numVirtualNodes="${numVirtualNodes}" rehashRpcTimeout="120000">
+ <groups enabled="true"/>
+ </hash>
+ <sync replTimeout="180000"/>
+ </clustering>
+ </namedCache>
+ <namedCache name="eXoCache">
+ <locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="120000" writeSkewCheck="false"
concurrencyLevel="500" useLockStriping="true" />
+ <transaction
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"
eagerLockSingleNode="true" transactionMode="TRANSACTIONAL"/>
+ <jmxStatistics enabled="true"/>
+ <clustering mode="distribution">
+ <l1 enabled="true"
invalidationThreshold="${invalidationThreshold}"/>
+ <hash numOwners="${numOwners}"
numVirtualNodes="${numVirtualNodes}" rehashRpcTimeout="120000"/>
+ <sync replTimeout="180000"/>
+ </clustering>
+ </namedCache>
+</infinispan>
\ No newline at end of file
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -54,7 +54,7 @@
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="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
</properties>
</cache>
@@ -63,7 +63,7 @@
<property name="index-dir"
value="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/production" />
<property name="changesfilter-class"
value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter"
/>
<property name="infinispan-configuration"
value="jar:/conf/portal/cluster/infinispan-indexer.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="max-volatile-time" value="60"
/>
</properties>
@@ -72,7 +72,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration"
value="jar:/conf/portal/cluster/infinispan-lock.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -114,7 +114,7 @@
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="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
</properties>
</cache>
@@ -123,7 +123,7 @@
<property name="index-dir"
value="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/backup" />
<property name="changesfilter-class"
value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter"
/>
<property name="infinispan-configuration"
value="jar:/conf/portal/cluster/infinispan-indexer.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="max-volatile-time" value="60"
/>
</properties>
@@ -132,7 +132,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration"
value="jar:/conf/portal/cluster/infinispan-lock.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -174,7 +174,7 @@
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="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
</properties>
</cache>
@@ -183,7 +183,7 @@
<property name="index-dir"
value="${exo.jcr.parent.dir:..}/temp/jcrlucenedb/digital-assets" />
<property name="changesfilter-class"
value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter"
/>
<property name="infinispan-configuration"
value="jar:/conf/portal/cluster/infinispan-indexer.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="max-volatile-time" value="60"
/>
</properties>
@@ -192,7 +192,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="infinispan-configuration"
value="jar:/conf/portal/cluster/infinispan-lock.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/cluster/udp-mux.xml" />
+ <property name="jgroups-configuration"
value="jar:/conf/udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml
(rev 0)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -0,0 +1,70 @@
+<!--
+ TCP based stack, with flow control and message bundling. This is usually used when
IP
+ multicasting cannot be used in a network, e.g. because it is disabled (routers
discard multicast).
+ Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly via system
properties, e.g.
+ -Djgroups.bind_addr=192.168.5.2 and
-Djgroups.tcpping.initial_hosts=192.168.5.2[7800]
+ author: Bela Ban
+-->
+<config xmlns="urn:org:jgroups"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups
http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <TCP singleton_name="JCR-cluster"
+ bind_port="7800"
+ loopback="false"
+ recv_buf_size="${tcp.recv_buf_size:20M}"
+ send_buf_size="${tcp.send_buf_size:640K}"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="true"
+ sock_conn_timeout="300"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="10"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="discard"/>
+
+ <TCPPING timeout="3000"
+
initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 min_interval="10000"
+ max_interval="30000"/>
+ <FD_SOCK/>
+ <FD timeout="3000" max_tries="3" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_mcast_xmit="false"
+ exponential_backoff="500"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER/>
+</config>
\ No newline at end of file
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml
(rev 0)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -0,0 +1,74 @@
+
+<!--
+ Default stack using IP multicasting. It is similar to the "udp"
+ stack in stacks.xml, but doesn't use streaming state transfer and flushing
+ author: Bela Ban
+-->
+
+<config xmlns="urn:org:jgroups"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups
http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <UDP
+ singleton_name="JCR-cluster"
+ mcast_port="${jgroups.udp.mcast_port:45588}"
+ tos="8"
+ ucast_recv_buf_size="20M"
+ ucast_send_buf_size="640K"
+ mcast_recv_buf_size="25M"
+ mcast_send_buf_size="640K"
+ loopback="true"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ ip_ttl="${jgroups.udp.ip_ttl:8}"
+ enable_bundling="true"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="2"
+ thread_pool.max_threads="8"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <PING timeout="2000"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD_ALL/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK exponential_backoff="300"
+ xmit_stagger_timeout="200"
+ use_mcast_xmit="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+</config>
\ No newline at end of file
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml
(rev 0)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -0,0 +1,70 @@
+<!--
+ TCP based stack, with flow control and message bundling. This is usually used when
IP
+ multicasting cannot be used in a network, e.g. because it is disabled (routers
discard multicast).
+ Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly via system
properties, e.g.
+ -Djgroups.bind_addr=192.168.5.2 and
-Djgroups.tcpping.initial_hosts=192.168.5.2[7800]
+ author: Bela Ban
+-->
+<config xmlns="urn:org:jgroups"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups
http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <TCP singleton_name="JCR-cluster"
+ bind_port="7800"
+ loopback="false"
+ recv_buf_size="${tcp.recv_buf_size:20M}"
+ send_buf_size="${tcp.send_buf_size:640K}"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="true"
+ sock_conn_timeout="300"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="10"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="discard"/>
+
+ <TCPPING timeout="3000"
+
initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 min_interval="10000"
+ max_interval="30000"/>
+ <FD_SOCK/>
+ <FD timeout="3000" max_tries="3" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_mcast_xmit="false"
+ exponential_backoff="500"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER/>
+</config>
\ No newline at end of file
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration-ijdbc-ispn.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration-ijdbc-ispn.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration-ijdbc-ispn.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -231,7 +231,7 @@
<init-params>
<value-param>
<name>jgroups-configuration</name>
- <value>jar:/conf/standalone/cluster/udp-mux.xml</value>
+ <value>jar:/conf/standalone/cluster/udp-mux-v3.xml</value>
</value-param>
<value-param>
<name>jgroups-cluster-name</name>
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -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="udp-mux.xml" />
+ zz
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -65,7 +65,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="max-volatile-time" value="60"
/>
</properties>
@@ -74,7 +74,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -114,7 +114,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -123,7 +123,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -141,7 +141,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -181,7 +181,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -190,7 +190,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -208,7 +208,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -272,7 +272,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -281,7 +281,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -299,7 +299,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -356,7 +356,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -365,7 +365,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -375,7 +375,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -421,7 +421,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -430,7 +430,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -440,7 +440,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -497,7 +497,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -506,7 +506,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -525,7 +525,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -572,7 +572,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -581,7 +581,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -599,7 +599,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
@@ -646,7 +646,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="use-distributed-cache"
value="${use-distributed-cache}" />
</properties>
@@ -655,7 +655,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.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" />
@@ -676,7 +676,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="udp-mux.xml" />
+ <property name="jgroups-configuration"
value="udp-mux-v3.xml" />
<property name="infinispan-cluster-name"
value="JCR-cluster" />
<property name="infinispan-cl-cache.jdbc.table.name"
value="lk" />
<property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
Added:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml
(rev 0)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -0,0 +1,74 @@
+
+<!--
+ Default stack using IP multicasting. It is similar to the "udp"
+ stack in stacks.xml, but doesn't use streaming state transfer and flushing
+ author: Bela Ban
+-->
+
+<config xmlns="urn:org:jgroups"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups
http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <UDP
+ singleton_name="JCR-cluster"
+ mcast_port="${jgroups.udp.mcast_port:45588}"
+ tos="8"
+ ucast_recv_buf_size="20M"
+ ucast_send_buf_size="640K"
+ mcast_recv_buf_size="25M"
+ mcast_send_buf_size="640K"
+ loopback="true"
+ discard_incompatible_packets="true"
+ max_bundle_size="64K"
+ max_bundle_timeout="30"
+ ip_ttl="${jgroups.udp.ip_ttl:8}"
+ enable_bundling="true"
+ enable_diagnostics="true"
+ thread_naming_pattern="cl"
+
+ timer_type="new"
+ timer.min_threads="4"
+ timer.max_threads="10"
+ timer.keep_alive_time="3000"
+ timer.queue_max_size="500"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="2"
+ thread_pool.max_threads="8"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <PING timeout="2000"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD_ALL/>
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK exponential_backoff="300"
+ xmit_stagger_timeout="200"
+ use_mcast_xmit="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST />
+ <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
+ max_bytes="4M"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ view_bundling="true"/>
+ <UFC max_credits="2M"
+ min_threshold="0.4"/>
+ <MFC max_credits="2M"
+ min_threshold="0.4"/>
+ <FRAG2 frag_size="60K" />
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+</config>
\ No newline at end of file
Deleted:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -1,74 +0,0 @@
-
-<!--
- Default stack using IP multicasting. It is similar to the "udp"
- stack in stacks.xml, but doesn't use streaming state transfer and flushing
- author: Bela Ban
--->
-
-<config xmlns="urn:org:jgroups"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups
http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <UDP
- singleton_name="JCR-cluster"
- mcast_port="${jgroups.udp.mcast_port:45588}"
- tos="8"
- ucast_recv_buf_size="20M"
- ucast_send_buf_size="640K"
- mcast_recv_buf_size="25M"
- mcast_send_buf_size="640K"
- loopback="true"
- discard_incompatible_packets="true"
- max_bundle_size="64K"
- max_bundle_timeout="30"
- ip_ttl="${jgroups.udp.ip_ttl:8}"
- enable_bundling="true"
- enable_diagnostics="true"
- thread_naming_pattern="cl"
-
- timer_type="new"
- timer.min_threads="4"
- timer.max_threads="10"
- timer.keep_alive_time="3000"
- timer.queue_max_size="500"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="2"
- thread_pool.max_threads="8"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10000"
- thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000"
- num_initial_members="3"/>
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD_ALL/>
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK exponential_backoff="300"
- xmit_stagger_timeout="200"
- use_mcast_xmit="false"
- discard_delivered_msgs="true"/>
- <UNICAST />
- <pbcast.STABLE stability_delay="1000"
desired_avg_gossip="50000"
- max_bytes="4M"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- view_bundling="true"/>
- <UFC max_credits="2M"
- min_threshold="0.4"/>
- <MFC max_credits="2M"
- min_threshold="0.4"/>
- <FRAG2 frag_size="60K" />
- <pbcast.STATE_TRANSFER />
- <!-- pbcast.FLUSH /-->
-</config>
\ No newline at end of file
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2012-03-22
12:18:56 UTC (rev 5939)
+++
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2012-03-22
13:27:52 UTC (rev 5940)
@@ -510,4 +510,20 @@
</listitem>
</orderedlist>
</section>
+ <section>
+ <title>Getting the effective configuration at Runtime of all the
+ repositories</title>
+
+ <para>The effective configuration of all the repositories and their
+ workspaces can be known thanks to the method
+ <emphasis>getConfigurationXML</emphasis>() that is exposed through JMX
at
+ the <emphasis>RepositoryServiceConfiguration</emphasis> level in case of
a
+ <emphasis>PortalContainer</emphasis> the name of the related MBean will
be
+ of type
+
<emphasis>exo:portal=${portal-container-name},service=RepositoryServiceConfiguration</emphasis>.
+ This method will give you the effective configuration in XML format that
+ has been really interpreted by the the JCR core. This could be helpful to
+ understand how your repositories/workspaces are configured especially if
+ you would like to overwrite the configuration for some reasons.</para>
+ </section>
</chapter>