February 2012 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r5567 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene and 1 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-02-06 07:23:19 -0500 (Mon, 06 Feb 2012) New Revision: 5567 Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexInfos.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java Log: EXOJCR-1730: Exception when stopping the coordinator in suspended cluster Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java 2012-02-03 09:30:35 UTC (rev 5566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java 2012-02-06 12:23:19 UTC (rev 5567) @@ -136,7 +136,10 @@ // re-read from FS current actual list. try { - super.read(); + if (!multiIndex.isStopped()) + { + super.read(); + } } catch (IOException e) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexInfos.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexInfos.java 2012-02-03 09:30:35 UTC (rev 5566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexInfos.java 2012-02-06 12:23:19 UTC (rev 5567) @@ -76,7 +76,7 @@ /** * {@link MultiIndex} instance for callbacking when list of indexes changed */ - private MultiIndex multiIndex; + protected MultiIndex multiIndex; /** * Creates a new IndexInfos using <code>"indexes"</code> as a filename. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2012-02-03 09:30:35 UTC (rev 5566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2012-02-06 12:23:19 UTC (rev 5567) @@ -3412,6 +3412,14 @@ } /** + * @return true if index is stopped. + */ + public boolean isStopped() + { + return stopped; + } + + /** * Switches index mode * * @param isOnline Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java 2012-02-03 09:30:35 UTC (rev 5566) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexInfos.java 2012-02-06 12:23:19 UTC (rev 5567) @@ -166,7 +166,10 @@ // re-read from FS current actual list. try { - super.read(); + if (!multiIndex.isStopped()) + { + super.read(); + } } catch (IOException e) {

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5566 - jcr/branches/1.12.x/patch/1.12.12-GA/JCR-1704.

by do-not-reply＠jboss.org

Author: dkuleshov Date: 2012-02-03 04:30:35 -0500 (Fri, 03 Feb 2012) New Revision: 5566 Modified: jcr/branches/1.12.x/patch/1.12.12-GA/JCR-1704/JCR-1704.patch Log: JCR-1704: new patch added Modified: jcr/branches/1.12.x/patch/1.12.12-GA/JCR-1704/JCR-1704.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.12-GA/JCR-1704/JCR-1704.patch 2012-02-02 13:34:59 UTC (rev 5565) +++ jcr/branches/1.12.x/patch/1.12.12-GA/JCR-1704/JCR-1704.patch 2012-02-03 09:30:35 UTC (rev 5566) @@ -1,42 +1,88 @@ Index: exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java =================================================================== ---- exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java (revision 5453) +--- exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java (revision 5559) +++ exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java (working copy) -@@ -144,6 +144,39 @@ +@@ -144,6 +144,85 @@ assertEquals(headers.getFirst(HttpHeaders.CONTENT_TYPE), property.getString()); } + /** -+ * Testing if read-only mime-types properties, which can be set as initial parameters -+ * for WebDavService, are indeed read-only. -+ * More info can be found here: https://jira.exoplatform.org/browse/JCR-1704 -+ * @throws Exception ++ * Testing if we use MimeTypeResolver to define jcr:mimeType property ++ * for untrusted user agents during resource creation. + */ -+ public void testReadOnlyMimeTypeProperties() throws Exception ++ public void testUntrustedUserAgentResourceCreation() throws Exception + { -+ String testMimeTypeProperty = "test/mime-type"; + String content = TestUtils.getFileContent(); + String path = TestUtils.getFileName(); ++ ++ // create User-Agent header indicating that the resource we create ++ // has application/octet-stream type ++ // though it's extension is .txt + MultivaluedMap<String, String> headers = new MultivaluedMapImpl(); ++ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM); ++ headers.add(HttpHeaders.USER_AGENT, "test-user-agent"); + -+ // setting content-type header -+ // test/mime-type is defined in init params to be read only mime type -+ headers.add(HttpHeaders.CONTENT_TYPE, testMimeTypeProperty); -+ // putting a resource ++ // fullfiling the request + service(WebDAVMethods.PUT, getPathWS() + path, "", headers, content.getBytes()); + ++ Node node = session.getRootNode().getNode(TextUtil.relativizePath(path)).getNode("jcr:content"); ++ // though that we passed application/octet-stream mime type ++ // the user agent is within untrusted user agents set ++ // so we use MimeTypeResolver to define the mimeType and ++ // ignore Content-Type header ++ assertEquals(MediaType.TEXT_PLAIN, node.getProperty("jcr:mimeType").getString()); ++ } ++ ++ /** ++ * Testing if we use MimeTypeResolver to define jcr:mimeType property ++ * for untrusted user agents during resource modification. ++ */ ++ public void testUntrustedUserAgentResourceModification() throws Exception ++ { ++ String content = TestUtils.getFileContent(); ++ String path = TestUtils.getFileName(); ++ ++ // create data with 'trusted' user agent ++ // (all user agents are considered to be trusted ++ // if they are not listed as untrusted) ++ MultivaluedMap<String, String> headers = new MultivaluedMapImpl(); ++ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN); ++ ++ service(WebDAVMethods.PUT, getPathWS() + path, "", headers, content.getBytes()); ++ + headers.clear(); -+ // setting content-type header again -+ // this time we set MediaType.TEXT_HTML to replace previous mime type -+ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML); -+ // putting one mopre time ++ content = TestUtils.getFileContent(); ++ // define user agent to be among untrusted user agents ++ headers.add(HttpHeaders.USER_AGENT, "test-user-agent"); ++ // define incorrect mime-type via seting Content-Type header ++ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM); ++ + service(WebDAVMethods.PUT, getPathWS() + path, "", headers, content.getBytes()); + -+ // gettin jcr:content node, which stores jcr:mimeType parameter + Node node = session.getRootNode().getNode(TextUtil.relativizePath(path)).getNode("jcr:content"); ++ // mime-type should still be correct ++ assertEquals(MediaType.TEXT_PLAIN, node.getProperty("jcr:mimeType").getString()); ++ } + -+ assertEquals("Mime-type property should not be changed.", testMimeTypeProperty, -+ node.getProperty("jcr:mimeType").getString()); ++ /** ++ * Testing if we can modify mime-type of previously defined resource ++ * via trusted user agent ++ */ ++ public void testTrustedUserAgentResourceModification() throws Exception ++ { ++ String content = TestUtils.getFileContent(); ++ String path = TestUtils.getFileName() + ".html"; ++ ++ service(WebDAVMethods.PUT, getPathWS() + path, "", null, content.getBytes()); ++ Node node = session.getRootNode().getNode(TextUtil.relativizePath(path)); ++ // mime-type is defined according to resource's extension ++ assertEquals(MediaType.TEXT_HTML, node.getNode("jcr:content").getProperty("jcr:mimeType").getString()); ++ ++ MultivaluedMap<String, String> headers = new MultivaluedMapImpl(); ++ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_XML); ++ service(WebDAVMethods.PUT, getPathWS() + path, "", headers, content.getBytes()); ++ // mime-type modified according to Content-Type header content ++ assertEquals(MediaType.TEXT_XML, node.getNode("jcr:content").getProperty("jcr:mimeType").getString()); + } + @Override @@ -44,36 +90,97 @@ { Index: exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml =================================================================== ---- exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml (revision 5453) +--- exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml (revision 5559) +++ exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml (working copy) -@@ -173,7 +173,7 @@ - <component> - <type>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</type> - <init-params> -- -+ - <value-param> - <name>auto-mix-lockable</name> - <value>false</value> -@@ -209,6 +209,15 @@ +@@ -209,6 +209,16 @@ <value>/absolute/path/to/file</value> </value-param> +  + <values-param> -+ <name>read-only-mime-types</name> -+ <value>test/mime-type</value> ++ <name>untrusted-user-agents</name> ++ <value>test-user-agent</value> + </values-param> -+ ++ </init-params> </component> +Index: exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java +=================================================================== +--- exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java (revision 5559) ++++ exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java (working copy) +@@ -18,15 +18,14 @@ + */ + package org.exoplatform.services.jcr.webdav; + ++import org.exoplatform.common.util.HierarchicalProperty; ++ + import java.io.InputStream; +-import java.util.List; + + import javax.ws.rs.core.MediaType; + import javax.ws.rs.core.Response; + import javax.ws.rs.core.UriInfo; + +-import org.exoplatform.common.util.HierarchicalProperty; +- + /** + * Created by The eXo Platform SARL .<br/> + * JCR WebDAV entry point. Defines WebDav protocol methods: RFC-2518 HTTP +@@ -68,7 +67,7 @@ + Response head(String repoName, String repoPath, UriInfo baseURI); + + /** +- * WedDAV "HEAD" method. See <a ++ * WedDAV "PUT" method. See <a + * href='http://www.ietf.org/rfc/rfc2518.txt'>HTTP methods for distributed + * authoring sec. 8.7 "PUT"</a>. + * +@@ -83,16 +82,37 @@ + * @param inputStream stream that contain incoming data + * @return the instance of javax.ws.rs.core.Response + */ ++ @Deprecated + Response put(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String fileNodeTypeHeader, + String contentNodeTypeHeader, String mixinTypes, MediaType mediatype, InputStream inputStream); + + /** ++ * WedDAV "PUT" method. See <a ++ * href='http://www.ietf.org/rfc/rfc2518.txt'>HTTP methods for distributed ++ * authoring sec. 8.7 "PUT"</a>. ++ * + * @param repoName repository name + * @param repoPath path in repository + * @param lockTokenHeader Lock-Token HTTP header + * @param ifHeader If HTTP Header ++ * @param fileNodeTypeHeader JCR NodeType header ++ * @param contentNodeTypeHeader JCR Content-NodeType header ++ * @param mixinTypes JCR Mixin types header ++ * @param mimeType Content-Type HTTP header ++ * @param userAgent User-Agent HTTP header ++ * @param inputStream stream that contain incoming data + * @return the instance of javax.ws.rs.core.Response + */ ++ Response put(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String fileNodeTypeHeader, ++ String contentNodeTypeHeader, String mixinTypes, MediaType mediaType, String userAgent, InputStream inputStream); ++ ++ /** ++ * @param repoName repository name ++ * @param repoPath path in repository ++ * @param lockTokenHeader Lock-Token HTTP header ++ * @param ifHeader If HTTP Header ++ * @return the instance of javax.ws.rs.core.Response ++ */ + Response delete(String repoName, String repoPath, String lockTokenHeader, String ifHeader); + + /** Index: exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java =================================================================== ---- exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java (revision 5453) +--- exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java (revision 5559) +++ exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java (working copy) @@ -23,6 +23,7 @@ import org.exoplatform.commons.utils.MimeTypeResolver; @@ -98,126 +205,79 @@ public static final String FOLDER_ICON_PATH = "folder-icon-path"; -+ public static final String READ_ONLY_MIME_TYPES = "read-only-mime-types"; ++ public static final String UNTRUSTED_USER_AGENTS = "untrusted-user-agents"; + /** * Logger. */ -@@ -192,6 +197,12 @@ +@@ -192,6 +197,10 @@ private Map<String, String> xsltParams = new HashMap<String, String>(); /** -+ * Set to keep all 'read-only' mime types. Mime-types listed here -+ * are not allowed to be changed. ++ * Set of untrusted user agents. Special rules are applied for listed agents. + */ -+ private Set<String> readOnlyMimeTypes = new HashSet<String>(); -+ ++ private Set<String> untrustedUserAgents = new HashSet<String>(); + /** * The list of allowed methods. */ private static final String ALLOW; -@@ -300,6 +311,11 @@ +@@ -300,6 +309,12 @@ } -+ ValuesParam pReadOnlyMimeTypes = params.getValuesParam(READ_ONLY_MIME_TYPES); -+ if (pReadOnlyMimeTypes != null) ++ ValuesParam pUntrustedUserAgents = params.getValuesParam(UNTRUSTED_USER_AGENTS); ++ if (pUntrustedUserAgents != null) + { -+ readOnlyMimeTypes.addAll((List<String>)pReadOnlyMimeTypes.getValues()); ++ untrustedUserAgents.addAll((List<String>)pUntrustedUserAgents.getValues()); + } ++ } /** -@@ -1038,7 +1054,8 @@ - NodeType nodeType = ntm.getNodeType(contentNodeType); - NodeTypeUtil.checkContentResourceType(nodeType); - -- return new PutCommand(nullResourceLocks).put(session, path(repoPath), inputStream, fileNodeType, -+ return new PutCommand(nullResourceLocks, readOnlyMimeTypes).put(session, path(repoPath), inputStream, -+ fileNodeType, - contentNodeType, NodeTypeUtil.getMixinTypes(mixinTypes), mimeType, encoding, updatePolicyType, - autoVersionType, tokens); - -Index: exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java -=================================================================== ---- exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java (revision 5453) -+++ exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java (working copy) -@@ -24,7 +24,9 @@ - - import java.io.InputStream; - import java.util.Calendar; -+import java.util.HashSet; - import java.util.List; -+import java.util.Set; - - import javax.jcr.AccessDeniedException; - import javax.jcr.Node; -@@ -50,6 +52,12 @@ - private final NullResourceLocksHolder nullResourceLocks; - - /** -+ * Set to keep all 'read-only' mime types. Mime-types listed here -+ * are not allowed to be changed. -+ */ -+ private final Set<String> readOnlyMimeTypes; -+ -+ /** - * Constructor. - * - * @param nullResourceLocks resource locks. -@@ -57,9 +65,22 @@ - public PutCommand(final NullResourceLocksHolder nullResourceLocks) - { - this.nullResourceLocks = nullResourceLocks; -+ this.readOnlyMimeTypes = new HashSet<String>(); +@@ -987,6 +1002,17 @@ + } } - /** -+ * Constructor. -+ * -+ * @param nullResourceLocks resource locks. -+ * @param readOnlyMimeTypes set of 'read-only' mime types -+ */ -+ public PutCommand(final NullResourceLocksHolder nullResourceLocks, Set<String> readOnlyMimeTypes) ++ @Deprecated ++ public Response put(@PathParam("repoName") String repoName, @PathParam("repoPath") String repoPath, ++ @HeaderParam(ExtHttpHeaders.LOCKTOKEN) String lockTokenHeader, @HeaderParam(ExtHttpHeaders.IF) String ifHeader, ++ @HeaderParam(ExtHttpHeaders.FILE_NODETYPE) String fileNodeTypeHeader, ++ @HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String contentNodeTypeHeader, ++ @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypes, ++ @HeaderParam(ExtHttpHeaders.CONTENT_TYPE) MediaType mediatype, InputStream inputStream) + { -+ this.nullResourceLocks = nullResourceLocks; -+ this.readOnlyMimeTypes = readOnlyMimeTypes; ++ return put(repoName, repoPath, lockTokenHeader, ifHeader, fileNodeTypeHeader, contentNodeTypeHeader, mixinTypes, ++ mediatype, null, inputStream); + } -+ -+ /** - * Webdav Put method implementation. - * - * @param session current session -@@ -205,7 +226,23 @@ + /** + * {@inheritDoc} + */ +@@ -997,9 +1023,9 @@ + @HeaderParam(ExtHttpHeaders.FILE_NODETYPE) String fileNodeTypeHeader, + @HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String contentNodeTypeHeader, + @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypes, +- @HeaderParam(ExtHttpHeaders.CONTENT_TYPE) MediaType mediatype, InputStream inputStream) ++ @HeaderParam(ExtHttpHeaders.CONTENT_TYPE) MediaType mediatype, ++ @HeaderParam(ExtHttpHeaders.USER_AGENT) String userAgent, InputStream inputStream) { +- + if (log.isDebugEnabled()) + { + log.debug("PUT " + repoName + "/" + repoPath); +@@ -1012,7 +1038,7 @@ + String mimeType = null; + String encoding = null; - Node content = node.getNode("jcr:content"); -- content.setProperty("jcr:mimeType", mimeType); -+ -+ /* -+ Workaround created to fix JCR-1704 -+ -+ 1. If readOnlyMimeTypes is not initialized it is okay to set any mime-type you want -+ 2. If readOnlyMimeTypes is empty, it won't be needed to call !content.hasProperty("jcr:mimeType") -+ which represents a potential query, and again it is okay to set any mime-type you want -+ 3. If jcr:mimeType property is not set, we can set it without worries -+ 4. If jcr:mimeType property isn't in 'read-only' properties list, -+ we can set it -+ */ -+ if (readOnlyMimeTypes == null || readOnlyMimeTypes.isEmpty() || !content.hasProperty("jcr:mimeType") -+ || !readOnlyMimeTypes.contains(content.getProperty("jcr:mimeType").getString())) -+ { -+ content.setProperty("jcr:mimeType", mimeType); -+ } -+ - if (encoding != null) - { - content.setProperty("jcr:encoding", encoding); +- if (mediatype == null) ++ if (mediatype == null || untrustedUserAgents.contains(userAgent)) + { + MimeTypeResolver mimeTypeResolver = new MimeTypeResolver(); + mimeTypeResolver.setDefaultMimeType(defaultFileMimeType); Index: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/protocols/webdav.xml =================================================================== ---- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/protocols/webdav.xml (revision 5453) +--- exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/protocols/webdav.xml (revision 5559) +++ exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/protocols/webdav.xml (working copy) -@@ -1,345 +1,470 @@ +@@ -1,345 +1,471 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []> -<chapter id="JCR.WebDAV"> @@ -719,16 +779,17 @@ + <value>/absolute/path/to/file</value> + </value-param> + -+  + <values-param> -+ <name>read-only-mime-types</name> -+ <value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value> ++ <name>untrusted-user-agents</name> ++ <value>Microsoft Office Core Storage Infrastructure/1.0</value> + </values-param> + ++ + </init-params> +</component></programlisting> + </section>

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5565 - in jcr/trunk/applications/product-patches/as: jetty and 2 other directories.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2012-02-02 08:34:59 -0500 (Thu, 02 Feb 2012) New Revision: 5565 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 Log: EXOJCR-1742 : fix configurations for all AppServers. Modified: jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml =================================================================== --- jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2012-02-02 11:52:55 UTC (rev 5564) +++ jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2012-02-02 13:34:59 UTC (rev 5565) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> - + <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"> @@ -209,7 +209,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> @@ -227,6 +227,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> @@ -358,9 +378,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-02-02 11:52:55 UTC (rev 5564) +++ jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2012-02-02 13:34:59 UTC (rev 5565) @@ -209,7 +209,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> @@ -227,6 +227,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-02-02 11:52:55 UTC (rev 5564) +++ jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2012-02-02 13:34:59 UTC (rev 5565) @@ -209,7 +209,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> @@ -227,6 +227,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-02-02 11:52:55 UTC (rev 5564) +++ jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2012-02-02 13:34:59 UTC (rev 5565) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> - + <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"> @@ -225,7 +225,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> @@ -243,6 +243,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> @@ -374,9 +394,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-02-02 11:52:55 UTC (rev 5564) +++ jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt 2012-02-02 13:34:59 UTC (rev 5565) @@ -13,3 +13,8 @@ * "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 + +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.

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5564 - in jcr/trunk: exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf and 1 other directories.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2012-02-02 06:52:55 -0500 (Thu, 02 Feb 2012) New Revision: 5564 Modified: 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/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml jcr/trunk/pom.xml Log: EXOJCR-1682: Upgraded to ISPN 5.1.1.CR1 and JGroups 3.0.4.Final (jcr) Modified: 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 2012-02-02 11:38:29 UTC (rev 5563) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml 2012-02-02 11:52:55 UTC (rev 5564) @@ -36,10 +36,20 @@ <jmxStatistics enabled="true"/> <clustering mode="distribution"> <l1 enabled="true" invalidationThreshold="${invalidationThreshold}"/> - <hash numOwners="2" rehashRpcTimeout="120000"> + <hash numOwners="3" 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="3" 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/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-02-02 11:38:29 UTC (rev 5563) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-02-02 11:52:55 UTC (rev 5564) @@ -25,7 +25,7 @@ <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="tcp-mux.xml"/> + <property name="configurationFile" value="tcp-mux-v3.xml"/> </properties> </transport> <shutdown hookBehavior="DEFAULT"/> @@ -36,10 +36,20 @@ <jmxStatistics enabled="true"/> <clustering mode="distribution"> <l1 enabled="true" invalidationThreshold="-1"/> - <hash numOwners="2" rehashRpcTimeout="120000"> + <hash numOwners="3" 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="-1"/> + <hash numOwners="3" rehashRpcTimeout="120000"/> + <sync replTimeout="180000"/> + </clustering> + </namedCache> </infinispan> \ No newline at end of file Modified: jcr/trunk/pom.xml =================================================================== --- jcr/trunk/pom.xml 2012-02-02 11:38:29 UTC (rev 5563) +++ jcr/trunk/pom.xml 2012-02-02 11:52:55 UTC (rev 5564) @@ -397,12 +397,12 @@ <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> - <version>5.1.0.FINAL</version> + <version>5.1.1.CR1</version> </dependency> <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-cachestore-jdbc</artifactId> - <version>5.1.0.FINAL</version> + <version>5.1.1.CR1</version> </dependency> <dependency> <groupId>commons-io</groupId>

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5563 - in kernel/trunk: exo.kernel.component.ext.cache.impl.infinispan.v5 and 1 other directories.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2012-02-02 06:38:29 -0500 (Thu, 02 Feb 2012) New Revision: 5563 Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml kernel/trunk/pom.xml Log: EXOJCR-1682: Upgraded to ISPN 5.1.1.CR1 and JGroups 3.0.4.Final (kernel) Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-02-02 10:04:17 UTC (rev 5562) +++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-02-02 11:38:29 UTC (rev 5563) @@ -34,7 +34,7 @@ <dependency> <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>3.0.3.Final</version> + <version>3.0.4.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-02-02 10:04:17 UTC (rev 5562) +++ kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-02-02 11:38:29 UTC (rev 5563) @@ -40,7 +40,7 @@ <dependency> <groupId>org.jgroups</groupId> <artifactId>jgroups</artifactId> - <version>3.0.3.Final</version> + <version>3.0.4.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2012-02-02 10:04:17 UTC (rev 5562) +++ kernel/trunk/pom.xml 2012-02-02 11:38:29 UTC (rev 5563) @@ -213,7 +213,7 @@ <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> - <version>5.1.0.FINAL</version> + <version>5.1.1.CR1</version> </dependency> <dependency> <groupId>org.jibx</groupId>

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5562 - in jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src: main/resources/conf/portal and 1 other directories.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2012-02-02 05:04:17 -0500 (Thu, 02 Feb 2012) New Revision: 5562 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/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/main/resources/conf/tcp-mux.xml jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml Modified: 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/portal/exo-jcr-ispn-config.xml jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml Log: EXOJCR-1742 : separate JGroups v2 and v3 configs using suffixes -v3 Modified: 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 2012-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -31,13 +31,13 @@ <properties-param> <name>parameters</name> <description>The parameters of the configuration</description> - <property name="configurationFile" value="udp-mux.xml"></property> + <property name="configurationFile" value="udp-mux-v3.xml"></property> <property name="invalidationThreshold" value="0"></property> </properties-param> <properties-param profiles="tcp"> <name>parameters</name> <description>The parameters of the configuration</description> - <property name="configurationFile" value="tcp-mux.xml"></property> + <property name="configurationFile" value="tcp-mux-v3.xml"></property> <property name="invalidationThreshold" value="-1"></property> </properties-param> </init-params> 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-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -55,7 +55,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> @@ -64,7 +64,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> @@ -73,7 +73,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="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" /> @@ -116,7 +116,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> @@ -125,7 +125,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> @@ -134,7 +134,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="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" /> @@ -177,7 +177,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> @@ -186,7 +186,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> @@ -195,7 +195,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> - <property name="jgroups-configuration" value="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" /> Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.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-02-02 10:04:17 UTC (rev 5562) @@ -0,0 +1,70 @@ + +<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 Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/tcp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -1,70 +0,0 @@ - -<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 Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.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-02-02 10:04:17 UTC (rev 5562) @@ -0,0 +1,74 @@ + + + +<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 /> +  +</config> \ No newline at end of file Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/udp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -1,74 +0,0 @@ - - - -<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 /> -  -</config> \ No newline at end of file Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux-v3.xml (from rev 5548, jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.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-02-02 10:04:17 UTC (rev 5562) @@ -0,0 +1,70 @@ + +<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 Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml 2012-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/tcp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -1,70 +0,0 @@ - -<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.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml 2012-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-configuration.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -229,7 +229,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.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2012-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -56,7 +56,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> @@ -66,7 +66,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> @@ -75,7 +75,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" /> @@ -116,7 +116,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> @@ -125,7 +125,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" /> @@ -143,7 +143,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" /> @@ -184,7 +184,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> @@ -193,7 +193,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" /> @@ -211,7 +211,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" /> @@ -276,7 +276,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> @@ -285,7 +285,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" /> @@ -303,7 +303,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" /> @@ -361,7 +361,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> @@ -370,7 +370,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" /> @@ -380,7 +380,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" /> @@ -427,7 +427,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> @@ -436,7 +436,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" /> @@ -446,7 +446,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" /> @@ -504,7 +504,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> @@ -513,7 +513,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" /> @@ -532,7 +532,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" /> @@ -580,7 +580,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> @@ -589,7 +589,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" /> @@ -607,7 +607,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" /> @@ -655,7 +655,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> @@ -664,7 +664,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" /> @@ -685,7 +685,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" /> Copied: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml (from rev 5548, 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-v3.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux-v3.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -0,0 +1,74 @@ + + + +<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 /> +  +</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-02-02 09:50:14 UTC (rev 5561) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/udp-mux.xml 2012-02-02 10:04:17 UTC (rev 5562) @@ -1,74 +0,0 @@ - - - -<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 /> -  -</config> \ No newline at end of file

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5561 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/resources/images.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2012-02-02 04:50:14 -0500 (Thu, 02 Feb 2012) New Revision: 5561 Added: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/resources/images/diagram-rsync-index.png Log: EXOJCR-1711 : add rsync diagram png Added: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/resources/images/diagram-rsync-index.png =================================================================== (Binary files differ) Property changes on: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/resources/images/diagram-rsync-index.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5560 - jcr/trunk/applications.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2012-02-02 04:03:09 -0500 (Thu, 02 Feb 2012) New Revision: 5560 Modified: jcr/trunk/applications/Readme.txt Log: EXOJCR-1696 : Introduced profile 'ispn' for applications and ear. Modified: jcr/trunk/applications/Readme.txt =================================================================== --- jcr/trunk/applications/Readme.txt 2012-02-02 08:21:37 UTC (rev 5559) +++ jcr/trunk/applications/Readme.txt 2012-02-02 09:03:09 UTC (rev 5560) @@ -5,7 +5,7 @@ 1.2. exo directory structure. 1.3. Maven version 2.2.1 (or higher). 1.4. Make sure you have run mvn instal within ./config folder. -2. Go to folder "exo.jcr.applications.tomcat" and run "mvn clean install -P deploy" command. +2. Go to folder "exo.jcr.applications.tomcat" and run "mvn clean install -Pdeploy" command. This will pack JCR with JBoss Cache based components. Or run "mvn clean install -Pdeploy,ispn" to pack JCR with Infinispan based components. 2.1 If you want to deploy JBoss or Jonas use exo.jcr.applications.jboss or exo.jcr.applications.jonas respectively. 3. If the command has executed successfully, go to exo-tomcat and run "eXo run" command.

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5559 - jcr/branches/1.15.x/exo.jcr.component.core.

by do-not-reply＠jboss.org

Author: dkuleshov Date: 2012-02-02 03:21:37 -0500 (Thu, 02 Feb 2012) New Revision: 5559 Modified: jcr/branches/1.15.x/exo.jcr.component.core/pom.xml Log: EXOJCR-1108: gunit tests moved to separate profile - gunit Modified: jcr/branches/1.15.x/exo.jcr.component.core/pom.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/pom.xml 2012-02-01 15:33:36 UTC (rev 5558) +++ jcr/branches/1.15.x/exo.jcr.component.core/pom.xml 2012-02-02 08:21:37 UTC (rev 5559) @@ -511,24 +511,6 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> </plugin> - -  - <plugin> - <groupId>org.antlr</groupId> - <artifactId>maven-gunit-plugin</artifactId> - <version>3.2</version> - <executions> - <execution> - <id>maven-gunit-plugin</id> - <phase>test</phase> - <goals> - <goal>gunit</goal> - </goals> - </execution> - </executions> - </plugin>  + <plugin> + <groupId>org.antlr</groupId> + <artifactId>maven-gunit-plugin</artifactId> + <version>3.2</version> + <executions> + <execution> + <id>maven-gunit-plugin</id> + <phase>test</phase> + <goals> + <goal>gunit</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r5558 - in core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database: utils and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-02-01 10:33:36 -0500 (Wed, 01 Feb 2012) New Revision: 5558 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java Log: EXOJCR-1741: Exception in DBCreator is not informative Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2012-02-01 15:31:26 UTC (rev 5557) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2012-02-01 15:33:36 UTC (rev 5558) @@ -244,7 +244,7 @@ } catch (SQLException e) { - throw new DBCreatorException("Can't execute SQL script : " + JDBCUtils.getFullMessage(e)); + throw new DBCreatorException("Can't execute SQL script : " + JDBCUtils.getFullMessage(e), e); } finally { Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java 2012-02-01 15:31:26 UTC (rev 5557) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java 2012-02-01 15:33:36 UTC (rev 5558) @@ -121,7 +121,7 @@ { StringBuilder errorTrace = new StringBuilder(exception.getMessage()); - SQLException next = exception.getNextException(); + SQLException next = exception; while (next != null) { errorTrace.append("; ");

12 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits February 2012