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

exo-jcr SVN: r5587 - in jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr: ispn and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-02-08 10:46:49 -0500 (Wed, 08 Feb 2012) New Revision: 5587 Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml Log: EXOJCR-1735: ISPN integration chapter Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml 2012-02-08 15:36:46 UTC (rev 5586) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml 2012-02-08 15:46:49 UTC (rev 5587) @@ -285,7 +285,7 @@ <listitem> <para>Use RepositorySuspendController suspend all repositories (see - <link linked="JCR.SearchIndexBackup">37.1 Repository + <link linkend="JCR.SearchIndexBackup">37.1 Repository suspending</link>)</para> </listitem> @@ -295,7 +295,7 @@ <listitem> <para>Use RepositorySuspendController to resume all repositories (see - <link linked="JCR.SearchIndexBackup">37.3 Repository + <link linkend="JCR.SearchIndexBackup">37.3 Repository resuming</link>)</para> </listitem> </itemizedlist> Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml 2012-02-08 15:36:46 UTC (rev 5586) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml 2012-02-08 15:46:49 UTC (rev 5587) @@ -53,6 +53,26 @@ <section> <title>Workspaces configuration requirements</title> + <para>Each mentioned below components uses instances of Infinispan Cache + product for caching in clustered environment. So every element has it's + own transport and has to be configured in a proper way. As usual, + workspaces have similar configuration. The simplest way to configure them + is to define their own configuration files for each component in each + workspace. There are several commons parameters. <abbrev></abbrev></para> + + <para><abbrev>"infinispan-configuration"</abbrev> defines path to template + based configuration for Infinispan Cache instance. </para> + + <para>JGroups is used by Infinispan Cache for network communications and + transport in a clustered environment. If property + <abbrev>"jgroups-configuration"</abbrev> is defined in component + configuration, it will be injected into the Infinispan Cache instance on + startup.</para> + + <para>The another parameter is <abbrev>"infinispan-cluster-name".</abbrev> + This defines the name of the cluster. Needs to be the same for all nodes + in a cluster in order to find each other.</para> + <itemizedlist> <listitem> <para>Cache configuration:</para> @@ -81,6 +101,17 @@ </properties> </query-handler> </programlisting> + + <itemizedlist> + <listitem> + <para><abbrev>changesfilter-class</abbrev> - defines cluster-ready + index strategy based on Infinispan Cache, it can be either + <classname>org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter</classname> + (for shared index) or + <classname>org.exoplatform.services.jcr.impl.core.query.ispn.LocalIndexChangesFilter</classname> + (for local index)</para> + </listitem> + </itemizedlist> </listitem> <listitem> @@ -103,6 +134,51 @@ </properties> </lock-manager>^ </programlisting> + + <itemizedlist> + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.table.name</abbrev> - table + name</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.table.create</abbrev> - is + true or false. Indicates whether to create table at start phase. + If true, the table is created if it does not already exist.</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.table.drop</abbrev> - is + true or false. Indicates whether to drop the table at stop + phase.</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.id.column</abbrev> - id + column name</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.data.column</abbrev> - data + column name</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.timestamp.column</abbrev> - + timestamp column name</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.datasource</abbrev> - name + of configured in Container datasource, where you want to store + locks. The best idea is to use the same as for workspace.</para> + </listitem> + + <listitem> + <para><abbrev>infinispan-cl-cache.jdbc.connectionFactory</abbrev> + - connection factories for use with the JDBC Cache Store.</para> + </listitem> + </itemizedlist> </listitem> </itemizedlist> </section> @@ -350,10 +426,6 @@ <row> <entry>jgroups-configuration</entry> </row> - - <row> - <entry>infinispan-cachestore-classname</entry> - </row> </tbody> </tgroup> </table>

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5586 - in ws/trunk/exo.ws.testframework: src/main/java/org/exoplatform/services/test/mock and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-08 10:36:46 -0500 (Wed, 08 Feb 2012) New Revision: 5586 Modified: ws/trunk/exo.ws.testframework/pom.xml ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java Log: EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: ws/trunk/exo.ws.testframework/pom.xml =================================================================== --- ws/trunk/exo.ws.testframework/pom.xml 2012-02-08 15:36:19 UTC (rev 5585) +++ ws/trunk/exo.ws.testframework/pom.xml 2012-02-08 15:36:46 UTC (rev 5586) @@ -37,5 +37,9 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file Modified: ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java =================================================================== --- ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2012-02-08 15:36:19 UTC (rev 5585) +++ ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2012-02-08 15:36:46 UTC (rev 5586) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.test.mock; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; @@ -44,6 +47,8 @@ public class MockHttpServletResponse implements HttpServletResponse { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.test.mock.MockHttpServletResponse"); + /** The writer. */ private PrintWriter writer; @@ -286,7 +291,10 @@ } catch (IOException e) { - + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } Modified: ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java =================================================================== --- ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java 2012-02-08 15:36:19 UTC (rev 5585) +++ ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java 2012-02-08 15:36:46 UTC (rev 5586) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.test.mock; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -44,6 +47,8 @@ public class MockServletContext implements ServletContext { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.MockServletContext"); + /** The name. */ private String name; @@ -182,6 +187,10 @@ } catch (MalformedURLException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return set; }

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5585 - in ws/branches/2.3.x/exo.ws.testframework: src/main/java/org/exoplatform/services/test/mock and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-08 10:36:19 -0500 (Wed, 08 Feb 2012) New Revision: 5585 Modified: ws/branches/2.3.x/exo.ws.testframework/pom.xml ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java Log: EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: ws/branches/2.3.x/exo.ws.testframework/pom.xml =================================================================== --- ws/branches/2.3.x/exo.ws.testframework/pom.xml 2012-02-08 12:52:58 UTC (rev 5584) +++ ws/branches/2.3.x/exo.ws.testframework/pom.xml 2012-02-08 15:36:19 UTC (rev 5585) @@ -37,5 +37,9 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file Modified: ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java =================================================================== --- ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2012-02-08 12:52:58 UTC (rev 5584) +++ ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2012-02-08 15:36:19 UTC (rev 5585) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.test.mock; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; @@ -44,6 +47,8 @@ public class MockHttpServletResponse implements HttpServletResponse { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.test.mock.MockHttpServletResponse"); + /** The writer. */ private PrintWriter writer; @@ -286,7 +291,10 @@ } catch (IOException e) { - + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } Modified: ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java =================================================================== --- ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java 2012-02-08 12:52:58 UTC (rev 5584) +++ ws/branches/2.3.x/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockServletContext.java 2012-02-08 15:36:19 UTC (rev 5585) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.test.mock; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -44,6 +47,8 @@ public class MockServletContext implements ServletContext { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.MockServletContext"); + /** The name. */ private String name; @@ -182,6 +187,10 @@ } catch (MalformedURLException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return set; }

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5584 - in jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr: ispn and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-02-08 07:52:58 -0500 (Wed, 08 Feb 2012) New Revision: 5584 Added: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml Log: EXOJCR-1735: ISPN integration chapter Added: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml (rev 0) +++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml 2012-02-08 12:52:58 UTC (rev 5584) @@ -0,0 +1,362 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" +"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> +<chapter id="ISPN.integration"> + <?dbhtml filename="ispn-integration.html"?> + + <title>Infinispan integration</title> + + <para>eXo JCR can rely on distributed cache such as Infinispan. This article + describes the required configuration.</para> + + <section> + <title>Components configuration requirements</title> + + <programlisting><component> + <key>org.infinispan.transaction.lookup.TransactionManagerLookup</key> + <type>org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup</type> +</component> + +<component profiles="ispn"> + <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 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> +</programlisting> + </section> + + <section> + <title>Workspaces configuration requirements</title> + + <itemizedlist> + <listitem> + <para>Cache configuration:</para> + + <programlisting language="xml"><cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <properties> + <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> + <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + </properties> +</cache> +</programlisting> + </listitem> + + <listitem> + <para>Indexer configuration</para> + + <programlisting language="xml"><query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <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/udp-mux-v3.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> + </properties> +</query-handler> +</programlisting> + </listitem> + + <listitem> + <para>Lock Manager configuration</para> + + <programlisting language="xml"><lock-manager class="org.exoplatform.services.jcr.impl.core.lock.infinispan.ISPNCacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> + <property name="jgroups-configuration" value="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" /> + <property name="infinispan-cl-cache.jdbc.table.drop" value="false" /> + <property name="infinispan-cl-cache.jdbc.id.column" value="id" /> + <property name="infinispan-cl-cache.jdbc.data.column" value="data" /> + <property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" /> + <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" /> + <property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" /> + </properties> +</lock-manager>^ +</programlisting> + </listitem> + </itemizedlist> + </section> + + <section> + <title>Shipped Infinispan Cache configuration templates</title> + + <para>eXo JCR implementation is shipped with ready-to-use Infinispan Cache + configuration templates for JCR's components. </para> + + <section> + <title>Data container template</title> + + <para>Data container template is "infinispan-data.xml":</para> + + <programlisting><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> + <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory"> + <properties> + <property name="threadNamePrefix" value="EvictionThread"/> + </properties> + </evictionScheduledExecutor> + + <globalJmxStatistics jmxDomain="exo" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout= + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <clustering mode="replication"> + <stateTransfer timeout="20000" fetchInMemoryState="false" /> + <sync replTimeout="20000"/> + </clustering> + + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="true"/> + <transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" s + <jmxStatistics enabled="true"/> + <eviction strategy="LRU" threadPolicy="DEFAULT" maxEntries="1000000"/> + <expiration wakeUpInterval="5000"/> + </default> +</infinispan> +</programlisting> + + <table> + <title>Template variables</title> + + <tgroup cols="1"> + <tbody> + <row> + <entry>infinispan-cluster-name</entry> + </row> + + <row> + <entry>jgroups-configuration</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section> + <title>Lock manager template</title> + + <para>Its template name is "infinispan-lock.xml"</para> + + <programlisting language="xml"><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> + <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory"> + <properties> + <property name="threadNamePrefix" value="EvictionThread"/> + </properties> + </evictionScheduledExecutor> + + <globalJmxStatistics jmxDomain="exo" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout= + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <clustering mode="replication"> + <stateTransfer timeout="20000" fetchInMemoryState="false" /> + <sync replTimeout="20000"/> + </clustering> + + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/> + <transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" s + <jmxStatistics enabled="true"/> + <eviction strategy="NONE"/> + + <loaders passivation="false" shared="true" preload="true"> + <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="true" ignoreModifications="false" purgeOnStar + <properties> + <property name="stringsTableNamePrefix" value="${infinispan-cl-cache.jdbc.table.name}"/> + <property name="idColumnName" value="${infinispan-cl-cache.jdbc.id.column}"/> + <property name="dataColumnName" value="${infinispan-cl-cache.jdbc.data.column}"/> + <property name="timestampColumnName" value="${infinispan-cl-cache.jdbc.timestamp.column}"/> + <property name="idColumnType" value="${infinispan-cl-cache.jdbc.id.type}"/> + <property name="dataColumnType" value="${infinispan-cl-cache.jdbc.data.type}"/> + <property name="timestampColumnType" value="${infinispan-cl-cache.jdbc.timestamp.type}"/> + <property name="dropTableOnExit" value="${infinispan-cl-cache.jdbc.table.drop}"/> + <property name="createTableOnStart" value="${infinispan-cl-cache.jdbc.table.create}"/> + <property name="connectionFactoryClass" value="${infinispan-cl-cache.jdbc.connectionFactory}"/> + <property name="datasourceJndiLocation" value="${infinispan-cl-cache.jdbc.datasource}"/> + </properties> + <async enabled="false"/> + </loader> + </loaders> + </default> + +</infinispan> +</programlisting> + + <table> + <title>Template variables</title> + + <tgroup cols="1"> + <tbody> + <row> + <entry>infinispan-cluster-name</entry> + </row> + + <row> + <entry>jgroups-configuration</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.table.name</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.id.column</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.data.column</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.timestamp.column</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.id.type</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.data.type</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.timestamp.type</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.table.drop</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.table.create</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.connectionFactory</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.datasource</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section> + <title>Query handler (indexer) template</title> + + <para>Have a look at "infinispan-indexer.xml"</para> + + <programlisting><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> + <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory"> + <properties> + <property name="threadNamePrefix" value="EvictionThread"/> + </properties> + </evictionScheduledExecutor> + + <globalJmxStatistics jmxDomain="exo" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout= + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <clustering mode="replication"> + <stateTransfer timeout="20000" fetchInMemoryState="false" /> + <sync replTimeout="20000"/> + </clustering> + + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/> + <transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" s + <jmxStatistics enabled="true"/> + <eviction strategy="NONE"/> + + <loaders passivation="false" shared="false" preload="false"> + <loader class="${infinispan-cachestore-classname}" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> + <async enabled="false"/> + </loader> + </loaders> + </default> +</infinispan> +</programlisting> + + <table> + <title>Template variable</title> + + <tgroup cols="1"> + <tbody> + <row> + <entry>infinispan-cluster-name</entry> + </row> + + <row> + <entry>jgroups-configuration</entry> + </row> + + <row> + <entry>infinispan-cachestore-classname</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + </section> +</chapter>

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5583 - jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-02-08 07:52:35 -0500 (Wed, 08 Feb 2012) New Revision: 5583 Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml Log: EXOJCR-1735: ISPN integration chapter Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml 2012-02-08 12:52:03 UTC (rev 5582) +++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml 2012-02-08 12:52:35 UTC (rev 5583) @@ -91,6 +91,9 @@ <xi:include href="jcr/transaction-manager-lookup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + + <xi:include href="jcr/ispn/ispn-integration.xml" + xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="jcr/repository-creation-service.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5582 - in jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules: jcr and 1 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-02-08 07:52:03 -0500 (Wed, 08 Feb 2012) New Revision: 5582 Added: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml Log: EXOJCR-1735: ISPN integration chapter Added: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml (rev 0) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/ispn/ispn-integration.xml 2012-02-08 12:52:03 UTC (rev 5582) @@ -0,0 +1,362 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" +"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> +<chapter id="ISPN.integration"> + <?dbhtml filename="ispn-integration.html"?> + + <title>Infinispan integration</title> + + <para>eXo JCR can rely on distributed cache such as Infinispan. This article + describes the required configuration.</para> + + <section> + <title>Components configuration requirements</title> + + <programlisting><component> + <key>org.infinispan.transaction.lookup.TransactionManagerLookup</key> + <type>org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup</type> +</component> + +<component profiles="ispn"> + <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 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> +</programlisting> + </section> + + <section> + <title>Workspaces configuration requirements</title> + + <itemizedlist> + <listitem> + <para>Cache configuration:</para> + + <programlisting language="xml"><cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <properties> + <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-data.xml" /> + <property name="jgroups-configuration" value="jar:/conf/udp-mux-v3.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + </properties> +</cache> +</programlisting> + </listitem> + + <listitem> + <para>Indexer configuration</para> + + <programlisting language="xml"><query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <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/udp-mux-v3.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> + </properties> +</query-handler> +</programlisting> + </listitem> + + <listitem> + <para>Lock Manager configuration</para> + + <programlisting language="xml"><lock-manager class="org.exoplatform.services.jcr.impl.core.lock.infinispan.ISPNCacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> + <property name="jgroups-configuration" value="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" /> + <property name="infinispan-cl-cache.jdbc.table.drop" value="false" /> + <property name="infinispan-cl-cache.jdbc.id.column" value="id" /> + <property name="infinispan-cl-cache.jdbc.data.column" value="data" /> + <property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" /> + <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" /> + <property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" /> + </properties> +</lock-manager>^ +</programlisting> + </listitem> + </itemizedlist> + </section> + + <section> + <title>Shipped Infinispan Cache configuration templates</title> + + <para>eXo JCR implementation is shipped with ready-to-use Infinispan Cache + configuration templates for JCR's components. </para> + + <section> + <title>Data container template</title> + + <para>Data container template is "infinispan-data.xml":</para> + + <programlisting><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> + <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory"> + <properties> + <property name="threadNamePrefix" value="EvictionThread"/> + </properties> + </evictionScheduledExecutor> + + <globalJmxStatistics jmxDomain="exo" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout= + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <clustering mode="replication"> + <stateTransfer timeout="20000" fetchInMemoryState="false" /> + <sync replTimeout="20000"/> + </clustering> + + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="true"/> + <transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" s + <jmxStatistics enabled="true"/> + <eviction strategy="LRU" threadPolicy="DEFAULT" maxEntries="1000000"/> + <expiration wakeUpInterval="5000"/> + </default> +</infinispan> +</programlisting> + + <table> + <title>Template variables</title> + + <tgroup cols="1"> + <tbody> + <row> + <entry>infinispan-cluster-name</entry> + </row> + + <row> + <entry>jgroups-configuration</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section> + <title>Lock manager template</title> + + <para>Its template name is "infinispan-lock.xml"</para> + + <programlisting language="xml"><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> + <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory"> + <properties> + <property name="threadNamePrefix" value="EvictionThread"/> + </properties> + </evictionScheduledExecutor> + + <globalJmxStatistics jmxDomain="exo" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout= + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <clustering mode="replication"> + <stateTransfer timeout="20000" fetchInMemoryState="false" /> + <sync replTimeout="20000"/> + </clustering> + + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/> + <transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" s + <jmxStatistics enabled="true"/> + <eviction strategy="NONE"/> + + <loaders passivation="false" shared="true" preload="true"> + <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="true" ignoreModifications="false" purgeOnStar + <properties> + <property name="stringsTableNamePrefix" value="${infinispan-cl-cache.jdbc.table.name}"/> + <property name="idColumnName" value="${infinispan-cl-cache.jdbc.id.column}"/> + <property name="dataColumnName" value="${infinispan-cl-cache.jdbc.data.column}"/> + <property name="timestampColumnName" value="${infinispan-cl-cache.jdbc.timestamp.column}"/> + <property name="idColumnType" value="${infinispan-cl-cache.jdbc.id.type}"/> + <property name="dataColumnType" value="${infinispan-cl-cache.jdbc.data.type}"/> + <property name="timestampColumnType" value="${infinispan-cl-cache.jdbc.timestamp.type}"/> + <property name="dropTableOnExit" value="${infinispan-cl-cache.jdbc.table.drop}"/> + <property name="createTableOnStart" value="${infinispan-cl-cache.jdbc.table.create}"/> + <property name="connectionFactoryClass" value="${infinispan-cl-cache.jdbc.connectionFactory}"/> + <property name="datasourceJndiLocation" value="${infinispan-cl-cache.jdbc.datasource}"/> + </properties> + <async enabled="false"/> + </loader> + </loaders> + </default> + +</infinispan> +</programlisting> + + <table> + <title>Template variables</title> + + <tgroup cols="1"> + <tbody> + <row> + <entry>infinispan-cluster-name</entry> + </row> + + <row> + <entry>jgroups-configuration</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.table.name</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.id.column</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.data.column</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.timestamp.column</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.id.type</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.data.type</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.timestamp.type</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.table.drop</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.table.create</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.connectionFactory</entry> + </row> + + <row> + <entry>infinispan-cl-cache.jdbc.datasource</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <section> + <title>Query handler (indexer) template</title> + + <para>Have a look at "infinispan-indexer.xml"</para> + + <programlisting><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> + <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory"> + <properties> + <property name="threadNamePrefix" value="EvictionThread"/> + </properties> + </evictionScheduledExecutor> + + <globalJmxStatistics jmxDomain="exo" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout= + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <clustering mode="replication"> + <stateTransfer timeout="20000" fetchInMemoryState="false" /> + <sync replTimeout="20000"/> + </clustering> + + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="false"/> + <transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" s + <jmxStatistics enabled="true"/> + <eviction strategy="NONE"/> + + <loaders passivation="false" shared="false" preload="false"> + <loader class="${infinispan-cachestore-classname}" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> + <async enabled="false"/> + </loader> + </loaders> + </default> +</infinispan> +</programlisting> + + <table> + <title>Template variable</title> + + <tgroup cols="1"> + <tbody> + <row> + <entry>infinispan-cluster-name</entry> + </row> + + <row> + <entry>jgroups-configuration</entry> + </row> + + <row> + <entry>infinispan-cachestore-classname</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + </section> +</chapter> Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml 2012-02-08 08:15:12 UTC (rev 5581) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr.xml 2012-02-08 12:52:03 UTC (rev 5582) @@ -91,6 +91,9 @@ <xi:include href="jcr/transaction-manager-lookup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + + <xi:include href="jcr/ispn/ispn-integration.xml" + xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="jcr/repository-creation-service.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5581 - jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-08 03:15:12 -0500 (Wed, 08 Feb 2012) New Revision: 5581 Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml Log: EXOJCR-1743: Applied patch proposed by DOC team Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml 2012-02-08 08:14:32 UTC (rev 5580) +++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml 2012-02-08 08:15:12 UTC (rev 5581) @@ -243,7 +243,7 @@ <description>cron job configuration</description> <init-params> <properties-param> - <name>job.info</name> + <name>cronjob.info</name> <description>dumb job executed by cron expression</description> <property name="jobName" value="DumbJob"/> <property name="groupName" value="DumbJobGroup"/>

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5580 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-02-08 03:14:32 -0500 (Wed, 08 Feb 2012) New Revision: 5580 Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml Log: EXOJCR-1743: Applied patch proposed by DOC team Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml 2012-02-07 16:57:40 UTC (rev 5579) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/job-scheduler-service.xml 2012-02-08 08:14:32 UTC (rev 5580) @@ -243,7 +243,7 @@ <description>cron job configuration</description> <init-params> <properties-param> - <name>job.info</name> + <name>cronjob.info</name> <description>dumb job executed by cron expression</description> <property name="jobName" value="DumbJob"/> <property name="groupName" value="DumbJobGroup"/>

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5579 - in jcr/trunk: exo.jcr.component.core.impl.infinispan.v5 and 4 other directories.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2012-02-07 11:57:40 -0500 (Tue, 07 Feb 2012) New Revision: 5579 Removed: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/zip-bundle-assembly.xml Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.cmd jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.sh jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/binary-assembly.xml 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.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/cache.xml jcr/trunk/pom.xml Log: EXOJCR-1682: Upgrade to ISPN 5.1.1.FINAL, doc, build and scripts reviewed (jcr) Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.cmd =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.cmd 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.cmd 2012-02-07 16:57:40 UTC (rev 5579) @@ -1 +1,9 @@ -java -Djava.net.preferIPv4Stack=true -Xms128m -Xmx512m -jar exo.jcr.component.core.impl.infinispan.v5-binary.jar %* + @echo off + setLocal EnableDelayedExpansion + set CACHE_SERVER_CP=". + for /R ./lib %%a in (*.jar) do ( + set CACHE_SERVER_CP=!CACHE_SERVER_CP!;%%a + ) + set CACHE_SERVER_CP=!CACHE_SERVER_CP!" + +java -Djava.net.preferIPv4Stack=true -Xms128m -Xmx512m -cp %CACHE_SERVER_CP% org.exoplatform.services.jcr.infinispan.CacheServer %* Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.sh =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.sh 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/bin/startCacheServer.sh 2012-02-07 16:57:40 UTC (rev 5579) @@ -1,3 +1,3 @@ #!/bin/sh - -java -Djava.net.preferIPv4Stack=true -Xms128m -Xmx512m -jar exo.jcr.component.core.impl.infinispan.v5-binary.jar $* +for i in lib/*.jar;do CACHE_SERVER_CP=$CACHE_SERVER_CP:$i;done +java -Djava.net.preferIPv4Stack=true -Xms128m -Xmx512m -cp .$CACHE_SERVER_CP org.exoplatform.services.jcr.infinispan.CacheServer $* Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -354,26 +354,8 @@ <descriptors> <descriptor>${basedir}/src/main/assemblies/binary-assembly.xml</descriptor> </descriptors> - <archive> - <manifest> - <mainClass>org.exoplatform.services.jcr.infinispan.CacheServer</mainClass> - </manifest> - </archive> </configuration> </execution> - <execution> - <id>bundle</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>${basedir}/src/main/assemblies/zip-bundle-assembly.xml</descriptor> - </descriptors> - </configuration> - </execution> </executions> </plugin> </plugins> Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/binary-assembly.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/binary-assembly.xml 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/binary-assembly.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -18,19 +18,17 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>binary</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>binary</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> <dependencySets> <dependencySet> <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> - <outputDirectory>/</outputDirectory> - <unpack>true</unpack> + <outputDirectory>lib</outputDirectory> <excludes> <exclude>org.jboss.cache:jbosscache-core</exclude> <exclude>junit:junit</exclude> @@ -38,33 +36,41 @@ <exclude>javax.faces:jsf-api</exclude> <exclude>javax.portlet:portlet-api</exclude> <exclude>jmock:jmock</exclude> - <exclude>org.ow2.jotm:*</exclude> <exclude>xdoclet:*</exclude> <exclude>org.exoplatform.tool:exo.tool.framework.junit</exclude> - <exclude>org.ow2.carol:*</exclude> - <exclude>org.ow2.carol.irmi:irmi</exclude> - <exclude>org.ow2.spec.ee:ow2-jta-1.1-spec</exclude> <exclude>org.jacorb:*</exclude> <exclude>quartz:quartz</exclude> <exclude>javax.mail:mail</exclude> <exclude>com.experlog:xapool</exclude> <exclude>antlr:antlr</exclude> - <exclude>avalon-framework:avalon-framework</exclude> - <exclude>logkit:logkit</exclude> - <exclude>org.objectweb.howl:howl</exclude> <exclude>org.jboss.javaee:jboss-transaction-api</exclude> <exclude>org.jboss:jboss-common-core</exclude> <exclude>org.hibernate:*</exclude> </excludes> - </dependencySet> + </dependencySet> <dependencySet> <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> - <outputDirectory>/</outputDirectory> + <outputDirectory>lib</outputDirectory> <scope>test</scope> - <unpack>true</unpack> <includes> - <include>org.slf4j:slf4j-log4j12</include> + <include>org.slf4j:slf4j-log4j12</include> </includes> - </dependencySet> - </dependencySets> + </dependencySet> + </dependencySets> + <files> + <file> + <source>${basedir}/src/main/doc/readme.txt</source> + <destName>readme.txt</destName> + </file> + </files> + <fileSets> + <fileSet> + <directory>${basedir}/bin</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.cmd</include> + <include>*.sh</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file Deleted: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/zip-bundle-assembly.xml =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/zip-bundle-assembly.xml 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/assemblies/zip-bundle-assembly.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -1,49 +0,0 @@ - -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>bundle</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <files> - <file> - <source>target/${project.artifactId}-binary.jar</source> - <destName>${project.artifactId}-binary.jar</destName> - </file> - <file> - <source>${basedir}/src/main/doc/readme.txt</source> - <destName>readme.txt</destName> - </file> - </files> - <fileSets> - <fileSet> - <directory>${basedir}/bin</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.cmd</include> - <include>*.sh</include> - </includes> - </fileSet> - </fileSets> -</assembly> 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-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -33,12 +33,16 @@ <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="3"></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="3"></property> + <property name="numVirtualNodes" value="1"></property> </properties-param> </init-params> </component> 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-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -36,7 +36,7 @@ <jmxStatistics enabled="true"/> <clustering mode="distribution"> <l1 enabled="true" invalidationThreshold="${invalidationThreshold}"/> - <hash numOwners="3" rehashRpcTimeout="120000"> + <hash numOwners="${numOwners}" numVirtualNodes="${numVirtualNodes}" rehashRpcTimeout="120000"> <groups enabled="true"/> </hash> <sync replTimeout="180000"/> @@ -48,7 +48,7 @@ <jmxStatistics enabled="true"/> <clustering mode="distribution"> <l1 enabled="true" invalidationThreshold="${invalidationThreshold}"/> - <hash numOwners="3" rehashRpcTimeout="120000"/> + <hash numOwners="${numOwners}" numVirtualNodes="${numVirtualNodes}" rehashRpcTimeout="120000"/> <sync replTimeout="180000"/> </clustering> </namedCache> Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/cache.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/cache.xml 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/cache.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -1797,13 +1797,16 @@ <init-params> <value-param> <name>infinispan-configuration</name> - <value>jar:/conf/portal/distributed-cache-configuration.xml</value> + <value>jar:/conf/distributed-cache-configuration.xml</value> </value-param> <properties-param> <name>parameters</name> <description>The parameters of the configuration</description> - <property name="infinispan-num-owners" value="1"></property> - </properties-param> + <property name="configurationFile" value="${gatein.jcr.jgroups.config}"></property> + <property name="invalidationThreshold" value="0"></property> + <property name="numOwners" value="3"></property> + <property name="numVirtualNodes" value="2"></property> + </properties-param> </init-params> </component></programlisting> @@ -1850,29 +1853,42 @@ use in case we would like to store the data of some eXo Cache instances into a distributed cache.</para> - <para>See below an example of infinispan configuration with only - <emphasis>eXoCache</emphasis> defined:</para> + <para>See below an example of infinispan configuration with both + <emphasis>eXoCache</emphasis> and <emphasis>JCRCache</emphasis> + defined:</para> <programlisting><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="Infinispan-cluster" distributedSyncTimeout="20000"> - <properties> - <property name="configurationFile" value="udp.xml"/> - </properties> + <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="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="true" /> + <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"> - <hash numOwners="${infinispan-num-owners}" rehashRpcTimeout="120000" /> - <sync/> + <l1 enabled="true" invalidationThreshold="${invalidationThreshold}"/> + <hash numOwners="${numOwners}" numVirtualNodes="${numVirtualNodes}" rehashRpcTimeout="120000"/> + <sync replTimeout="180000"/> </clustering> - <invocationBatching enabled="true"/> </namedCache> </infinispan></programlisting> </section> @@ -1883,7 +1899,7 @@ <para>In case you intend to use the distribued mode, you can launch external JVM in standalone mode to provide more memory to your current cache. To do so, you will need to get the file of type - <emphasis>exo.jcr.component.core.impl.infinispan.v5-X.Y.Z-binary.zip</emphasis> + <emphasis>exo.jcr.component.core.impl.infinispan.v5-binary.zip</emphasis> in which you will find scripts to launch your cache servers. These scripts allow optional arguments that are described below:</para> @@ -1951,6 +1967,15 @@ </tbody> </tgroup> </table> + + <note> + <para>If you intend to use the CacheServer in order to manage some + of your eXo Cache instances, don't forget to add the jar files that + define both the keys and the values in the lib directory of the + CacheServer distribution and restarts your CacheServer instances + otherwise the unmarshalling will fail with + <emphasis>java.lang.ClassNotFoundException</emphasis>.</para> + </note> </section> <section> Modified: jcr/trunk/pom.xml =================================================================== --- jcr/trunk/pom.xml 2012-02-07 16:55:49 UTC (rev 5578) +++ jcr/trunk/pom.xml 2012-02-07 16:57:40 UTC (rev 5579) @@ -397,12 +397,12 @@ <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> - <version>5.1.1.CR1</version> + <version>5.1.1.FINAL</version> </dependency> <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-cachestore-jdbc</artifactId> - <version>5.1.1.CR1</version> + <version>5.1.1.FINAL</version> </dependency> <dependency> <groupId>commons-io</groupId>

12 years, 7 months

1
0
0 / 0

exo-jcr SVN: r5578 - in kernel/trunk: exo.kernel.component.common and 1 other directory.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2012-02-07 11:55:49 -0500 (Tue, 07 Feb 2012) New Revision: 5578 Modified: kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/pom.xml Log: EXOJCR-1682: Upgrade to ISPN 5.1.1.FINAL (kernel) Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2012-02-07 15:45:59 UTC (rev 5577) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2012-02-07 16:55:49 UTC (rev 5578) @@ -65,6 +65,7 @@ <dependency> <groupId>org.ow2.jotm</groupId> <artifactId>jotm-core</artifactId> + <scope>provided</scope> <exclusions> <exclusion> <groupId>javax.resource</groupId> Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2012-02-07 15:45:59 UTC (rev 5577) +++ kernel/trunk/pom.xml 2012-02-07 16:55:49 UTC (rev 5578) @@ -213,7 +213,7 @@ <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-core</artifactId> - <version>5.1.1.CR1</version> + <version>5.1.1.FINAL</version> </dependency> <dependency> <groupId>org.jibx</groupId>

12 years, 7 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