10:57 a.m.
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/assembl...
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
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/assembl...
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
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 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
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>