JBoss Cache SVN: r5372 - core/trunk/src/test/java/org/jboss/cache/api.
by jbosscache-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2008-02-26 10:46:14 -0500 (Tue, 26 Feb 2008)
New Revision: 5372
Added:
core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java
Log:
[JBCACHE-1296] Test for JBCACHE-1296
Added: core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2008-02-26 15:46:14 UTC (rev 5372)
@@ -0,0 +1,139 @@
+package org.jboss.cache.api;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+import javax.transaction.TransactionManager;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Tests whether, in a single tx, deleting a parent node with an pre-existing
+ * child and then re-adding a node with the parent Fqn results
+ * in the pre-existing child remaining in the cache after tx commit.
+ *
+ * @author Brian Stansberry
+ * @since 2.1.0
+ */
+@Test(groups = {"functional"})
+public class DeletedChildResurrectionTest
+{
+ private Cache<Object, Object> cache;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp()
+ {
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception
+ {
+ cache.stop();
+ cache.destroy();
+ cache = null;
+ }
+
+ /**
+ * Tests whether the deleted child re-appears if the parent node is re-added
+ * via a simple node.addChild(parentFqn) call. Pessimistic locking case.
+ *
+ * @throws Exception
+ */
+ public void testDeletedChildResurrectionPessimistic1() throws Exception
+ {
+ deletedChildResurrectionTest1(false);
+ }
+
+ /**
+ * Tests whether the deleted child re-appears if the parent node is re-added
+ * via a simple node.addChild(parentFqn) call. Optimistic locking case.
+ *
+ * @throws Exception
+ */
+ public void testDeletedChildResurrectionOptimistic1() throws Exception
+ {
+ deletedChildResurrectionTest1(true);
+ }
+
+ /**
+ * Tests whether the deleted child re-appears if the parent node is re-added
+ * via a node.addChild(differentChildofParentFqn) call. Pessimistic locking case.
+ *
+ * @throws Exception
+ */
+ public void testDeletedChildResurrectionPessimistic2() throws Exception
+ {
+ deletedChildResurrectionTest2(false);
+ }
+
+ /**
+ * Tests whether the deleted child re-appears if the parent node is re-added
+ * via a node.addChild(differentChildofParentFqn) call. Optimistic locking case.
+ *
+ * @throws Exception
+ */
+ public void testDeletedChildResurrectionOptimistic2() throws Exception
+ {
+ deletedChildResurrectionTest2(true);
+ }
+
+ /**
+ * Tests whether, in a single tx, deleting a parent node with an pre-existing
+ * child and then inserting a different child under the parent Fqn results
+ * in the pre-existing child remaining in the cache after tx commit.
+ */
+ private void deletedChildResurrectionTest1(boolean optimistic) throws Exception
+ {
+
+ Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
+ config.setCacheMode(Configuration.CacheMode.LOCAL);
+ config.setNodeLockingOptimistic(optimistic);
+ cache = (Cache<Object, Object>) new DefaultCacheFactory().createCache(config, true);
+
+ TransactionManager txManager = cache.getConfiguration().getRuntimeConfig().getTransactionManager();
+
+ cache.getRoot().addChild(Fqn.fromString("/a/b")).put("key", "value");
+ txManager.begin();
+ cache.getRoot().removeChild(Fqn.fromString("/a"));
+ cache.getRoot().addChild(Fqn.fromString("/a"));
+ txManager.commit();
+ assertNull(cache.getRoot().getChild(Fqn.fromString("/a/b")));
+ Node a = cache.getRoot().getChild(Fqn.fromString("/a"));
+ assertNotNull(a);
+ }
+
+ /**
+ * Tests whether, in a single tx, deleting a parent node with an pre-existing
+ * child and then inserting a different child under the parent Fqn results
+ * in the pre-existing child remaining in the cache after tx commit.
+ */
+ private void deletedChildResurrectionTest2(boolean optimistic) throws Exception
+ {
+ Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
+ config.setCacheMode(Configuration.CacheMode.LOCAL);
+ config.setNodeLockingOptimistic(optimistic);
+ cache = (Cache<Object, Object>) new DefaultCacheFactory().createCache(config, true);
+
+ TransactionManager txManager = cache.getConfiguration().getRuntimeConfig().getTransactionManager();
+
+ cache.getRoot().addChild(Fqn.fromString("/a/b")).put("key", "value");
+
+ txManager.begin();
+ cache.getRoot().removeChild(Fqn.fromString("/a"));
+ cache.getRoot().addChild(Fqn.fromString("/a/c")).put("k2", "v2");
+ txManager.commit();
+ assertNull(cache.getRoot().getChild(Fqn.fromString("/a/b")));
+ Node ac = cache.getRoot().getChild(Fqn.fromString("/a/c"));
+ assertNotNull(ac);
+ assertEquals("v2", ac.get("k2"));
+ }
+}
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5371 - in core/trunk/src: test/java/org/jboss/cache/lock and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-02-26 07:39:28 -0500 (Tue, 26 Feb 2008)
New Revision: 5371
Modified:
core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java
core/trunk/src/main/java/org/jboss/cache/lock/LockMap.java
core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java
Log:
Fixed an concurrency bug introduced in 2.1.4.CR4.
The issues is caused by the fact that the list of readLockOwners returned by LockMap is not guarded against modifications. This might cause ConcurrentModificationExceptions being raised at different points in code (basically on any usage of IdentityLock.getReadOwners)
Modified: core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java 2008-02-21 04:28:29 UTC (rev 5370)
+++ core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java 2008-02-26 12:39:28 UTC (rev 5371)
@@ -145,6 +145,11 @@
return map_.writerOwner();
}
+ public LockMap getLockMap()
+ {
+ return map_;
+ }
+
/**
* Acquire a write lock with a timeout of <code>timeout</code> milliseconds.
* Note that if the current owner owns a read lock, it will be upgraded
@@ -456,10 +461,6 @@
sb.append("read owners=").append(read_owners);
printed_read_owners = true;
}
- else
- {
- read_owners = null;
- }
Object write_owner = lock_ != null ? getWriterOwner() : null;
if (write_owner != null)
Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockMap.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/LockMap.java 2008-02-21 04:28:29 UTC (rev 5370)
+++ core/trunk/src/main/java/org/jboss/cache/lock/LockMap.java 2008-02-26 12:39:28 UTC (rev 5371)
@@ -6,10 +6,7 @@
*/
package org.jboss.cache.lock;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
/**
* Provide lock ownership mapping.
@@ -116,8 +113,16 @@
*/
public Collection<Object> readerOwners()
{
- return readOwnerList_;
-// return Collections.unmodifiableSet(readOwnerList_);
+ //make a defense copy, otherwise ConcurrentModificationException might appear while client code is iterating
+ // the original map (see IdentityLockTest.testConcurrentModificationOfReadLocksAndToString)
+ List readOwnersListCopy;
+ synchronized (readOwnerList_) //readOwnerList_ is a sync list, make sure noone modifies it while we make a copy of it.
+ {
+ readOwnersListCopy = new ArrayList(readOwnerList_);
+ readOwnersListCopy.addAll(readOwnerList_);
+ }
+ return Collections.unmodifiableList(readOwnersListCopy);
+// return readOwnerList_;
}
public void releaseReaderOwners(LockStrategy lock)
Modified: core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java 2008-02-21 04:28:29 UTC (rev 5370)
+++ core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java 2008-02-26 12:39:28 UTC (rev 5371)
@@ -532,4 +532,66 @@
logger_.info("-- [" + Thread.currentThread() + "]: " + msg);
}
+ /**
+ * When IdentityLock.toString is called and readLockOwners are modified an ConcurrentModificationException exception
+ * might be thrown.
+ */
+ public void testConcurrentModificationOfReadLocksAndToString() throws Exception
+ {
+ final IdentityLock iLock = (IdentityLock) lock_;
+ final LockMap lockMap = iLock.getLockMap();
+ final int opCount = 100000;
+ final Thread readLockChanger = new Thread()
+ {
+ public void run()
+ {
+ for (int i = 0; i < opCount; i++)
+ {
+ if (i%10 ==0) System.out.println("readLockChanger loop# " + i);
+ lockMap.addReader(new Object());
+ }
+ }
+ };
+
+ final boolean[] flags = new boolean[]{false, false}; //{testFailure, stopTheThread}
+ Thread toStringProcessor = new Thread()
+ {
+ public void run()
+ {
+ long initialTime = System.currentTimeMillis();
+ for (int i = 0; i < opCount; i++)
+ {
+ if (i%10 ==0)
+ {
+ System.out.println("toStringProcessor loop# " + i + ", " + (System.currentTimeMillis() - initialTime));
+ initialTime = System.currentTimeMillis();
+ }
+ try
+ {
+ iLock.toString(new StringBuffer(), false);
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ flags[0] = true;
+ break;
+ }
+ if (flags[1]) break;
+ }
+ }
+ };
+ toStringProcessor.start();
+ System.out.println("toStringProcessor started");
+ readLockChanger.start();
+ System.out.println("readLockChanger started");
+
+ readLockChanger.join();
+ flags[1] = true;//stopping the toStringProcessor
+ System.out.println("readLockChanger stopped");
+
+ toStringProcessor.join();
+ System.out.println("toStringProcessor stopped");
+
+ System.out.println("flags[0]=" + flags[0]);
+ assertFalse(flags[0]);
+ }
}
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5370 - in pojo/tags: 2.1.0.CR4 and 3 other directories.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 23:28:29 -0500 (Wed, 20 Feb 2008)
New Revision: 5370
Added:
pojo/tags/2.1.0.CR4/
pojo/tags/2.1.0.CR4/pom.xml
pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java
pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java
pojo/tags/2.1.0.CR4/src/test/resources/META-INF/
pojo/tags/2.1.0.CR4/src/test/resources/log4j.xml
Removed:
pojo/tags/2.1.0.CR4/pom.xml
pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java
pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java
Log:
Tag 2.1.0.CR4
Copied: pojo/tags/2.1.0.CR4 (from rev 5362, pojo/branches/2.1)
Deleted: pojo/tags/2.1.0.CR4/pom.xml
===================================================================
--- pojo/branches/2.1/pom.xml 2008-02-20 16:57:50 UTC (rev 5362)
+++ pojo/tags/2.1.0.CR4/pom.xml 2008-02-21 04:28:29 UTC (rev 5370)
@@ -1,288 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <properties>
- <jbosscache-pojo-version>2.1.0.CR4</jbosscache-pojo-version>
- <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
- <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
- </properties>
- <parent>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-common-parent</artifactId>
- <version>1.1</version>
- </parent>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-pojo</artifactId>
- <version>${jbosscache-pojo-version}</version>
- <name>JBoss Cache - POJO Edition</name>
- <description>JBoss Cache - POJO Edition</description>
- <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${jboss.aop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>${jbosscache-core-version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>${jbosscache-core-version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <!-- Hack AOP has broken deps -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>2.0.0.Beta4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>install</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>assembly/bin.xml</descriptor>
- <descriptor>assembly/doc.xml</descriptor>
- <descriptor>assembly/all.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}-${jbosscache-pojo-version}</finalName>
- <outputDirectory>target/distribution</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>bind.address</name>
- <value>127.0.0.1</value>
- </property>
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
- <property>
- <name>jgroups.stack</name>
- <value>udp</value>
- </property>
- </systemProperties>
- <groups>functional</groups>
- <forkMode>always</forkMode>
- <argLine>-Djboss.aop.path=${basedir}/src/main/resources/META-INF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/jboss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine>
- <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) -->
- <!-- This seems to fail in some cases on 2.3 as well, disable for now -->
- <useSystemClassLoader>true</useSystemClassLoader>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jbossaop-plugin</artifactId>
- <version>2.0.0.beta1</version>
- <!-- HACK: AOP project and plugin has broken deps -->
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>${jbosscache-core-version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${jboss.aop.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>aopc</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <verbose>false</verbose>
- <aoppaths>
- <aoppath>${basedir}/src/main/resources/META-INF/pojocache-aop.xml</aoppath>
- </aoppaths>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- the docbook generation plugin for the user guide -->
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-doc-xslt-support</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
-
- <!-- The User Guide-->
- <execution>
- <id>userguide_en</id>
- <phase>package</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook/userguide/en</sourceDirectory>
- <imageResource>
- <directory>${basedir}/src/main/docbook/images</directory>
- </imageResource>
- <cssResource>
- <directory>${basedir}/src/main/docbook/css</directory>
- </cssResource>
- <targetDirectory>${basedir}/target/docbook/userguide_en</targetDirectory>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
- <finalName>userguide_en.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>false</xincludeSupported>
- </options>
- </configuration>
- </execution>
-
- <!-- The Tutorial -->
- <execution>
- <id>tutorial_en</id>
- <phase>package</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</sourceDirectory>
- <imageResource>
- <directory>${basedir}/src/main/docbook/images</directory>
- </imageResource>
- <cssResource>
- <directory>${basedir}/src/main/docbook/css</directory>
- </cssResource>
- <targetDirectory>${basedir}/target/docbook/tutorial_en</targetDirectory>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
- <finalName>tutorial_en.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>false</xincludeSupported>
- </options>
- </configuration>
- </execution>
-
- <!-- the FAQs -->
- <execution>
- <id>faq_en</id>
- <phase>package</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceDirectory>
- <imageResource>
- <directory>${basedir}/src/main/docbook/images</directory>
- </imageResource>
- <cssResource>
- <directory>${basedir}/src/main/docbook/css</directory>
- </cssResource>
- <targetDirectory>${basedir}/target/docbook/faq_en</targetDirectory>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
- <finalName>faq_en.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>false</xincludeSupported>
- </options>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
-</project>
Copied: pojo/tags/2.1.0.CR4/pom.xml (from rev 5369, pojo/branches/2.1/pom.xml)
===================================================================
--- pojo/tags/2.1.0.CR4/pom.xml (rev 0)
+++ pojo/tags/2.1.0.CR4/pom.xml 2008-02-21 04:28:29 UTC (rev 5370)
@@ -0,0 +1,292 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <properties>
+ <jbosscache-pojo-version>2.1.0.CR4</jbosscache-pojo-version>
+ <jbosscache-core-version>2.1.0.CR4</jbosscache-core-version>
+ <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
+ </properties>
+ <parent>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-common-parent</artifactId>
+ <version>1.1</version>
+ </parent>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-pojo</artifactId>
+ <version>${jbosscache-pojo-version}</version>
+ <name>JBoss Cache - POJO Edition</name>
+ <description>JBoss Cache - POJO Edition</description>
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${jboss.aop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>${jbosscache-core-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>${jbosscache-core-version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>install</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly/bin.xml</descriptor>
+ <descriptor>assembly/doc.xml</descriptor>
+ <descriptor>assembly/all.xml</descriptor>
+ </descriptors>
+ <finalName>${artifactId}-${jbosscache-pojo-version}</finalName>
+ <outputDirectory>target/distribution</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>bind.address</name>
+ <value>127.0.0.1</value>
+ </property>
+ <property>
+ <name>java.net.preferIPv4Stack</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>jgroups.stack</name>
+ <value>udp</value>
+ </property>
+ </systemProperties>
+ <groups>functional</groups>
+ <forkMode>always</forkMode>
+ <argLine>-Djboss.aop.path=${basedir}/src/main/resources/META-INF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/jboss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine>
+ <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) -->
+ <!-- This seems to fail in some cases on 2.3 as well, disable for now -->
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jbossaop-plugin</artifactId>
+ <version>2.0.0.beta1</version>
+ <!-- HACK: AOP project and plugin has broken deps -->
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>${jbosscache-core-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${jboss.aop.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>aopc</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <verbose>false</verbose>
+ <aoppaths>
+ <aoppath>${basedir}/src/main/resources/META-INF/pojocache-aop.xml</aoppath>
+ </aoppaths>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- the docbook generation plugin for the user guide -->
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.0.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-doc-xslt-support</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <executions>
+
+ <!-- The User Guide-->
+ <execution>
+ <id>userguide_en</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resources</goal>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${basedir}/src/main/docbook/userguide/en</sourceDirectory>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/images</directory>
+ </imageResource>
+ <cssResource>
+ <directory>${basedir}/src/main/docbook/css</directory>
+ </cssResource>
+ <targetDirectory>${basedir}/target/docbook/userguide_en</targetDirectory>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
+ <finalName>userguide_en.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>false</xincludeSupported>
+ </options>
+ </configuration>
+ </execution>
+
+ <!-- The Tutorial -->
+ <execution>
+ <id>tutorial_en</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resources</goal>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</sourceDirectory>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/images</directory>
+ </imageResource>
+ <cssResource>
+ <directory>${basedir}/src/main/docbook/css</directory>
+ </cssResource>
+ <targetDirectory>${basedir}/target/docbook/tutorial_en</targetDirectory>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
+ <finalName>tutorial_en.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>false</xincludeSupported>
+ </options>
+ </configuration>
+ </execution>
+
+ <!-- the FAQs -->
+ <execution>
+ <id>faq_en</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resources</goal>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceDirectory>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/images</directory>
+ </imageResource>
+ <cssResource>
+ <directory>${basedir}/src/main/docbook/css</directory>
+ </cssResource>
+ <targetDirectory>${basedir}/target/docbook/faq_en</targetDirectory>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
+ <finalName>faq_en.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>false</xincludeSupported>
+ </options>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+</project>
Deleted: pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java
===================================================================
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-20 16:57:50 UTC (rev 5362)
+++ pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-21 04:28:29 UTC (rev 5370)
@@ -1,270 +0,0 @@
-/*
- *
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.Random;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.lock.UpgradeException;
-import org.jboss.cache.misc.TestingUtil;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-/**
- * Local concurrent test for PojoCache. Test attach and detach under load
- * and concurrency.
- *
- * @version $Revision$
- * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004
- */
-@Test(groups = {"functional"}, enabled = false)
-public class LocalConcurrentTest
-{
- static PojoCache cache_;
- Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
- Properties p_;
- String oldFactory_ = null;
- final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
- static ArrayList<String> nodeList_;
- static final int depth_ = 2;
- static final int children_ = 2;
- static final int MAX_LOOP = 100;
- static final int SLEEP_TIME = 50;
- static Exception thread_ex = null;
- UserTransaction tx_ = null;
-
- @BeforeMethod(alwaysRun = true)
- public void setUp() throws Exception
- {
- oldFactory_ = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
- DummyTransactionManager.getInstance();
- if (p_ == null)
- {
- p_ = new Properties();
- p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
- }
-
- tx_ = (UserTransaction) new InitialContext(p_).lookup("UserTransaction");
-
- initCaches(Configuration.CacheMode.LOCAL);
- nodeList_ = nodeGen(depth_, children_);
-
- log("LocalConcurrentTestCase: cacheMode=TRANSIENT, one cache");
- }
-
- @AfterMethod(alwaysRun = true)
- public void tearDown() throws Exception
- {
- thread_ex = null;
- DummyTransactionManager.destroy();
- destroyCaches();
-
- if (oldFactory_ != null)
- {
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
- oldFactory_ = null;
- }
-
- }
-
- void initCaches(Configuration.CacheMode caching_mode) throws Exception
- {
- cachingMode_ = caching_mode;
- boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/local-service.xml", toStart);
- cache_.start();
- }
-
- void destroyCaches() throws Exception
- {
- cache_.stop();
- cache_ = null;
- }
-
- public void testAll_RWLock() throws Exception
- {
- try
- {
- all();
- }
- catch (UpgradeException ue)
- {
- log("Upgrade exception. Can ingore for repeatable read. " + ue);
- }
- catch (Exception ex)
- {
- log("Exception: " + ex);
- throw ex;
- }
- }
-
- private void all() throws Exception
- {
- RunThread t1 = new RunThread(1);
- RunThread t2 = new RunThread(2);
- RunThread t3 = new RunThread(3);
- RunThread t4 = new RunThread(4);
-
- t1.start();
- TestingUtil.sleepThread(100);
- t2.start();
- TestingUtil.sleepThread(100);
- t3.start();
- TestingUtil.sleepThread(100);
- t4.start();
-
- t1.join(60000);// wait for 20 secs
- t2.join(60000);// wait for 20 secs
- t3.join(60000);// wait for 20 secs
- t4.join(60000);// wait for 20 secs
-
- if (thread_ex != null)
- {
- throw thread_ex;
- }
- }
-
- class RunThread extends Thread
- {
- final int seed_;
- Random random_;
- Person person_;
-
- public RunThread(int seed)
- {
- seed_ = seed;
- random_ = new Random(seed);
- }
-
- private void createPerson()
- {
- person_ = new Person();
- person_.setName("Ben");
- person_.setAge(18);
- ArrayList<String> lang = new ArrayList<String>();
- lang.add("English");
- lang.add("French");
- lang.add("Mandarin");
- person_.setLanguages(lang);
- Address addr = new Address();
- addr.setZip(95123);
- addr.setStreet("Almeria");
- addr.setCity("San Jose");
- person_.setAddress(addr);
- }
-
- public void run()
- {
- try
- {
- _run();
- }
- catch (Exception e)
- {
- thread_ex = e;
- }
- }
-
- /**
- */
- public void _run() throws Exception
- {
- for (int loop = 0; loop < MAX_LOOP; loop++)
- {
- createPerson();// create a new person instance every loop.
- TestingUtil.sleepThread(random_.nextInt(50));
- op1();
- }
- }
-
- // Operation 1
- private void op1()
- {
- int i = random_.nextInt(nodeList_.size() - 1);
- if (i == 0) return;// it is meaningless to test root
- String node = nodeList_.get(i) + "/aop";
- cache_.attach(node, person_);
- TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for max 200 millis
- TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for max 200 millis
- cache_.detach(node);
- }
- }
-
- /**
- * Generate the tree nodes quasi-exponentially. I.e., depth is the level
- * of the hierarchy and children is the number of children under each node.
- * This strucutre is used to add, get, and remove for each node.
- */
- private ArrayList<String> nodeGen(int depth, int children)
- {
- ArrayList<String> strList = new ArrayList<String>();
- ArrayList<String> oldList = new ArrayList<String>();
- ArrayList<String> newList = new ArrayList<String>();
-
- // Skip root node
- oldList.add("/");
- newList.add("/");
- strList.add("/");
-
- while (depth > 0)
- {
- // Trying to produce node name at this depth.
- newList = new ArrayList<String>();
- for (int i = 0; i < oldList.size(); i++)
- {
- for (int j = 0; j < children; j++)
- {
- String tmp = oldList.get(i);
- tmp += Integer.toString(j);
- if (depth != 1)
- {
- tmp += "/";
- }
-
- newList.add(tmp);
- }
- }
- strList.addAll(newList);
- oldList = newList;
- depth--;
- }
-
- // let's prune out root node
- for (int i = 0; i < strList.size(); i++)
- {
- if (strList.get(i).equals("/"))
- {
- strList.remove(i);
- break;
- }
- }
- log("Nodes generated: " + strList.size());
- return strList;
- }
-
-
- private static void log(String str)
- {
- System.out.println("Thread: " + Thread.currentThread() + ": " + str);
- // System.out.println(str);
- }
-
-}
Copied: pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java (from rev 5369, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java)
===================================================================
--- pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java (rev 0)
+++ pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-21 04:28:29 UTC (rev 5370)
@@ -0,0 +1,270 @@
+/*
+ *
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Random;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+/**
+ * Local concurrent test for PojoCache. Test attach and detach under load
+ * and concurrency.
+ *
+ * @version $Revision$
+ * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004
+ */
+@Test(groups = {"functional"})
+public class LocalConcurrentTest
+{
+ static PojoCache cache_;
+ Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL;
+ Properties p_;
+ String oldFactory_ = null;
+ final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
+ static ArrayList<String> nodeList_;
+ static final int depth_ = 2;
+ static final int children_ = 2;
+ static final int MAX_LOOP = 100;
+ static final int SLEEP_TIME = 50;
+ static Exception thread_ex = null;
+ UserTransaction tx_ = null;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws Exception
+ {
+ oldFactory_ = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+ DummyTransactionManager.getInstance();
+ if (p_ == null)
+ {
+ p_ = new Properties();
+ p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
+ }
+
+ tx_ = (UserTransaction) new InitialContext(p_).lookup("UserTransaction");
+
+ initCaches(Configuration.CacheMode.LOCAL);
+ nodeList_ = nodeGen(depth_, children_);
+
+ log("LocalConcurrentTestCase: cacheMode=TRANSIENT, one cache");
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception
+ {
+ thread_ex = null;
+ DummyTransactionManager.destroy();
+ destroyCaches();
+
+ if (oldFactory_ != null)
+ {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
+ oldFactory_ = null;
+ }
+
+ }
+
+ void initCaches(Configuration.CacheMode caching_mode) throws Exception
+ {
+ cachingMode_ = caching_mode;
+ boolean toStart = false;
+ cache_ = PojoCacheFactory.createCache("META-INF/local-service.xml", toStart);
+ cache_.start();
+ }
+
+ void destroyCaches() throws Exception
+ {
+ cache_.stop();
+ cache_ = null;
+ }
+
+ public void testAll_RWLock() throws Exception
+ {
+ try
+ {
+ all();
+ }
+ catch (UpgradeException ue)
+ {
+ log("Upgrade exception. Can ingore for repeatable read. " + ue);
+ }
+ catch (Exception ex)
+ {
+ log("Exception: " + ex);
+ throw ex;
+ }
+ }
+
+ private void all() throws Exception
+ {
+ RunThread t1 = new RunThread(1);
+ RunThread t2 = new RunThread(2);
+ RunThread t3 = new RunThread(3);
+ RunThread t4 = new RunThread(4);
+
+ t1.start();
+ TestingUtil.sleepThread(100);
+ t2.start();
+ TestingUtil.sleepThread(100);
+ t3.start();
+ TestingUtil.sleepThread(100);
+ t4.start();
+
+ t1.join(60000);// wait for 20 secs
+ t2.join(60000);// wait for 20 secs
+ t3.join(60000);// wait for 20 secs
+ t4.join(60000);// wait for 20 secs
+
+ if (thread_ex != null)
+ {
+ throw thread_ex;
+ }
+ }
+
+ class RunThread extends Thread
+ {
+ final int seed_;
+ Random random_;
+ Person person_;
+
+ public RunThread(int seed)
+ {
+ seed_ = seed;
+ random_ = new Random(seed);
+ }
+
+ private void createPerson()
+ {
+ person_ = new Person();
+ person_.setName("Ben");
+ person_.setAge(18);
+ ArrayList<String> lang = new ArrayList<String>();
+ lang.add("English");
+ lang.add("French");
+ lang.add("Mandarin");
+ person_.setLanguages(lang);
+ Address addr = new Address();
+ addr.setZip(95123);
+ addr.setStreet("Almeria");
+ addr.setCity("San Jose");
+ person_.setAddress(addr);
+ }
+
+ public void run()
+ {
+ try
+ {
+ _run();
+ }
+ catch (Exception e)
+ {
+ thread_ex = e;
+ }
+ }
+
+ /**
+ */
+ public void _run() throws Exception
+ {
+ for (int loop = 0; loop < MAX_LOOP; loop++)
+ {
+ createPerson();// create a new person instance every loop.
+ TestingUtil.sleepThread(random_.nextInt(50));
+ op1();
+ }
+ }
+
+ // Operation 1
+ private void op1()
+ {
+ int i = random_.nextInt(nodeList_.size() - 1);
+ if (i == 0) return;// it is meaningless to test root
+ String node = nodeList_.get(i) + "/aop";
+ cache_.attach(node, person_);
+ TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for max 200 millis
+ TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for max 200 millis
+ cache_.detach(node);
+ }
+ }
+
+ /**
+ * Generate the tree nodes quasi-exponentially. I.e., depth is the level
+ * of the hierarchy and children is the number of children under each node.
+ * This strucutre is used to add, get, and remove for each node.
+ */
+ private ArrayList<String> nodeGen(int depth, int children)
+ {
+ ArrayList<String> strList = new ArrayList<String>();
+ ArrayList<String> oldList = new ArrayList<String>();
+ ArrayList<String> newList = new ArrayList<String>();
+
+ // Skip root node
+ oldList.add("/");
+ newList.add("/");
+ strList.add("/");
+
+ while (depth > 0)
+ {
+ // Trying to produce node name at this depth.
+ newList = new ArrayList<String>();
+ for (int i = 0; i < oldList.size(); i++)
+ {
+ for (int j = 0; j < children; j++)
+ {
+ String tmp = oldList.get(i);
+ tmp += Integer.toString(j);
+ if (depth != 1)
+ {
+ tmp += "/";
+ }
+
+ newList.add(tmp);
+ }
+ }
+ strList.addAll(newList);
+ oldList = newList;
+ depth--;
+ }
+
+ // let's prune out root node
+ for (int i = 0; i < strList.size(); i++)
+ {
+ if (strList.get(i).equals("/"))
+ {
+ strList.remove(i);
+ break;
+ }
+ }
+ log("Nodes generated: " + strList.size());
+ return strList;
+ }
+
+
+ private static void log(String str)
+ {
+ System.out.println("Thread: " + Thread.currentThread() + ": " + str);
+ // System.out.println(str);
+ }
+
+}
Deleted: pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java
===================================================================
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-20 16:57:50 UTC (rev 5362)
+++ pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-21 04:28:29 UTC (rev 5370)
@@ -1,268 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo.region;
-
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.Random;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.lock.UpgradeException;
-import org.jboss.cache.misc.TestingUtil;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Local concurrent test for PojoCache. Test attach and detach under load
- * and concurrency.
- *
- * @version $Revision$
- * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004
- */
-@Test(groups = {"functional"}, enabled = false)
-public class LocalConcurrentTest
-{
- static PojoCache cache_;
- Properties p_;
- String oldFactory_ = null;
- final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
- static ArrayList<String> nodeList_;
- static final int depth_ = 2;
- static final int children_ = 2;
- static final int MAX_LOOP = 100;
- static final int SLEEP_TIME = 50;
- static Exception thread_ex = null;
- UserTransaction tx_ = null;
-
- @BeforeMethod(alwaysRun = true)
- public void setUp() throws Exception
- {
- oldFactory_ = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
- DummyTransactionManager.getInstance();
- if (p_ == null)
- {
- p_ = new Properties();
- p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
- }
-
- tx_ = (UserTransaction) new InitialContext(p_).lookup("UserTransaction");
-
- initCaches();
- nodeList_ = nodeGen(depth_, children_);
-
- log("LocalConcurrentTestCase: cacheMode=TRANSIENT, one cache");
- }
-
- @AfterMethod(alwaysRun = true)
- public void tearDown() throws Exception
- {
- thread_ex = null;
- DummyTransactionManager.destroy();
- destroyCaches();
-
- if (oldFactory_ != null)
- {
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
- oldFactory_ = null;
- }
-
- }
-
- void initCaches() throws Exception
- {
- boolean toStart = false;
- cache_ = PojoCacheFactory.createCache("META-INF/local-service.xml", toStart);
- cache_.start();
- }
-
- void destroyCaches() throws Exception
- {
- cache_.stop();
- cache_ = null;
- }
-
- public void testAll_RWLock() throws Exception
- {
- try
- {
- all();
- }
- catch (UpgradeException ue)
- {
- log("Upgrade exception. Can ingore for repeatable read. " + ue);
- }
- catch (Exception ex)
- {
- log("Exception: " + ex);
- throw ex;
- }
- }
-
- private void all() throws Exception
- {
- RunThread t1 = new RunThread(1, "t1");
- RunThread t2 = new RunThread(2, "t2");
- RunThread t3 = new RunThread(3, "t3");
- RunThread t4 = new RunThread(4, "t4");
-
- t1.start();
- TestingUtil.sleepThread(100);
- t2.start();
- TestingUtil.sleepThread(100);
- t3.start();
- TestingUtil.sleepThread(100);
- t4.start();
-
- t1.join(60000); // wait for 20 secs
- t2.join(60000); // wait for 20 secs
- t3.join(60000); // wait for 20 secs
- t4.join(60000); // wait for 20 secs
-
- if (thread_ex != null)
- throw thread_ex;
- }
-
- class RunThread extends Thread
- {
- final int seed_;
- Random random_;
- Person person_;
-
- public RunThread(int seed, String threadName)
- {
- super(threadName);
- seed_ = seed;
- random_ = new Random(seed);
- }
-
- private void createPerson()
- {
- person_ = new Person();
- person_.setName("Ben");
- person_.setAge(18);
- ArrayList<String> lang = new ArrayList<String>();
- lang.add("English");
- lang.add("French");
- lang.add("Mandarin");
- person_.setLanguages(lang);
- Address addr = new Address();
- addr.setZip(95123);
- addr.setStreet("Almeria");
- addr.setCity("San Jose");
- person_.setAddress(addr);
- }
-
- public void run()
- {
- try
- {
- cache_.getCache().getRegion(Fqn.fromString(Thread.currentThread().getName()), true);
- _run();
- }
- catch (Exception e)
- {
- thread_ex = e;
- }
- }
-
- /**
- */
- public void _run() throws Exception
- {
- for (int loop = 0; loop < MAX_LOOP; loop++)
- {
- createPerson(); // create a new person instance every loop.
- op1();
- }
- }
-
- // Operation 1
- private void op1()
- {
- int i = random_.nextInt(nodeList_.size() - 1);
- if (i == 0) return; // it is meaningless to test root
- String node = nodeList_.get(i) + "/aop";
- cache_.attach(node, person_);
- TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep for max 200 millis
- TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep for max 200 millis
- cache_.detach(node);
- }
- }
-
- /**
- * Generate the tree nodes quasi-exponentially. I.e., depth is the level
- * of the hierarchy and children is the number of children under each node.
- * This strucutre is used to add, get, and remove for each node.
- */
- private ArrayList<String> nodeGen(int depth, int children)
- {
- ArrayList<String> strList = new ArrayList<String>();
- ArrayList<String> oldList = new ArrayList<String>();
- ArrayList<String> newList = new ArrayList<String>();
-
- // Skip root node
- String str = Thread.currentThread().getName();
- oldList.add(str);
- newList.add(str);
- strList.add(str);
-
- while (depth > 0)
- {
- // Trying to produce node name at this depth.
- newList = new ArrayList<String>();
- for (int i = 0; i < oldList.size(); i++)
- {
- for (int j = 0; j < children; j++)
- {
- String tmp = oldList.get(i);
- tmp += Integer.toString(j);
- if (depth != 1)
- {
- tmp += "/";
- }
-
- newList.add(tmp);
- }
- }
- strList.addAll(newList);
- oldList = newList;
- depth--;
- }
-
- // let's prune out root node
- for (int i = 0; i < strList.size(); i++)
- {
- if (strList.get(i).equals("/"))
- {
- strList.remove(i);
- break;
- }
- }
- log("Nodes generated: " + strList.size());
- return strList;
- }
-
-
- private static void log(String str)
- {
- System.out.println("Thread: " + Thread.currentThread() + ": " + str);
-// System.out.println(str);
- }
-
-}
Copied: pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java (from rev 5369, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java)
===================================================================
--- pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java (rev 0)
+++ pojo/tags/2.1.0.CR4/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-21 04:28:29 UTC (rev 5370)
@@ -0,0 +1,268 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo.region;
+
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Random;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+
+import org.jboss.cache.Fqn;
+import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Local concurrent test for PojoCache. Test attach and detach under load
+ * and concurrency.
+ *
+ * @version $Revision$
+ * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004
+ */
+@Test(groups = {"functional"})
+public class LocalConcurrentTest
+{
+ static PojoCache cache_;
+ Properties p_;
+ String oldFactory_ = null;
+ final String FACTORY = "org.jboss.cache.transaction.DummyContextFactory";
+ static ArrayList<String> nodeList_;
+ static final int depth_ = 2;
+ static final int children_ = 2;
+ static final int MAX_LOOP = 100;
+ static final int SLEEP_TIME = 50;
+ static Exception thread_ex = null;
+ UserTransaction tx_ = null;
+
+ @BeforeMethod(alwaysRun = true)
+ public void setUp() throws Exception
+ {
+ oldFactory_ = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+ DummyTransactionManager.getInstance();
+ if (p_ == null)
+ {
+ p_ = new Properties();
+ p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
+ }
+
+ tx_ = (UserTransaction) new InitialContext(p_).lookup("UserTransaction");
+
+ initCaches();
+ nodeList_ = nodeGen(depth_, children_);
+
+ log("LocalConcurrentTestCase: cacheMode=TRANSIENT, one cache");
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void tearDown() throws Exception
+ {
+ thread_ex = null;
+ DummyTransactionManager.destroy();
+ destroyCaches();
+
+ if (oldFactory_ != null)
+ {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
+ oldFactory_ = null;
+ }
+
+ }
+
+ void initCaches() throws Exception
+ {
+ boolean toStart = false;
+ cache_ = PojoCacheFactory.createCache("META-INF/local-service.xml", toStart);
+ cache_.start();
+ }
+
+ void destroyCaches() throws Exception
+ {
+ cache_.stop();
+ cache_ = null;
+ }
+
+ public void testAll_RWLock() throws Exception
+ {
+ try
+ {
+ all();
+ }
+ catch (UpgradeException ue)
+ {
+ log("Upgrade exception. Can ingore for repeatable read. " + ue);
+ }
+ catch (Exception ex)
+ {
+ log("Exception: " + ex);
+ throw ex;
+ }
+ }
+
+ private void all() throws Exception
+ {
+ RunThread t1 = new RunThread(1, "t1");
+ RunThread t2 = new RunThread(2, "t2");
+ RunThread t3 = new RunThread(3, "t3");
+ RunThread t4 = new RunThread(4, "t4");
+
+ t1.start();
+ TestingUtil.sleepThread(100);
+ t2.start();
+ TestingUtil.sleepThread(100);
+ t3.start();
+ TestingUtil.sleepThread(100);
+ t4.start();
+
+ t1.join(60000); // wait for 20 secs
+ t2.join(60000); // wait for 20 secs
+ t3.join(60000); // wait for 20 secs
+ t4.join(60000); // wait for 20 secs
+
+ if (thread_ex != null)
+ throw thread_ex;
+ }
+
+ class RunThread extends Thread
+ {
+ final int seed_;
+ Random random_;
+ Person person_;
+
+ public RunThread(int seed, String threadName)
+ {
+ super(threadName);
+ seed_ = seed;
+ random_ = new Random(seed);
+ }
+
+ private void createPerson()
+ {
+ person_ = new Person();
+ person_.setName("Ben");
+ person_.setAge(18);
+ ArrayList<String> lang = new ArrayList<String>();
+ lang.add("English");
+ lang.add("French");
+ lang.add("Mandarin");
+ person_.setLanguages(lang);
+ Address addr = new Address();
+ addr.setZip(95123);
+ addr.setStreet("Almeria");
+ addr.setCity("San Jose");
+ person_.setAddress(addr);
+ }
+
+ public void run()
+ {
+ try
+ {
+ cache_.getCache().getRegion(Fqn.fromString(Thread.currentThread().getName()), true);
+ _run();
+ }
+ catch (Exception e)
+ {
+ thread_ex = e;
+ }
+ }
+
+ /**
+ */
+ public void _run() throws Exception
+ {
+ for (int loop = 0; loop < MAX_LOOP; loop++)
+ {
+ createPerson(); // create a new person instance every loop.
+ op1();
+ }
+ }
+
+ // Operation 1
+ private void op1()
+ {
+ int i = random_.nextInt(nodeList_.size() - 1);
+ if (i == 0) return; // it is meaningless to test root
+ String node = nodeList_.get(i) + "/aop";
+ cache_.attach(node, person_);
+ TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep for max 200 millis
+ TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep for max 200 millis
+ cache_.detach(node);
+ }
+ }
+
+ /**
+ * Generate the tree nodes quasi-exponentially. I.e., depth is the level
+ * of the hierarchy and children is the number of children under each node.
+ * This strucutre is used to add, get, and remove for each node.
+ */
+ private ArrayList<String> nodeGen(int depth, int children)
+ {
+ ArrayList<String> strList = new ArrayList<String>();
+ ArrayList<String> oldList = new ArrayList<String>();
+ ArrayList<String> newList = new ArrayList<String>();
+
+ // Skip root node
+ String str = Thread.currentThread().getName();
+ oldList.add(str);
+ newList.add(str);
+ strList.add(str);
+
+ while (depth > 0)
+ {
+ // Trying to produce node name at this depth.
+ newList = new ArrayList<String>();
+ for (int i = 0; i < oldList.size(); i++)
+ {
+ for (int j = 0; j < children; j++)
+ {
+ String tmp = oldList.get(i);
+ tmp += Integer.toString(j);
+ if (depth != 1)
+ {
+ tmp += "/";
+ }
+
+ newList.add(tmp);
+ }
+ }
+ strList.addAll(newList);
+ oldList = newList;
+ depth--;
+ }
+
+ // let's prune out root node
+ for (int i = 0; i < strList.size(); i++)
+ {
+ if (strList.get(i).equals("/"))
+ {
+ strList.remove(i);
+ break;
+ }
+ }
+ log("Nodes generated: " + strList.size());
+ return strList;
+ }
+
+
+ private static void log(String str)
+ {
+ System.out.println("Thread: " + Thread.currentThread() + ": " + str);
+// System.out.println(str);
+ }
+
+}
Copied: pojo/tags/2.1.0.CR4/src/test/resources/META-INF (from rev 5369, pojo/branches/2.1/src/test/resources/META-INF)
Copied: pojo/tags/2.1.0.CR4/src/test/resources/log4j.xml (from rev 5369, pojo/branches/2.1/src/test/resources/log4j.xml)
===================================================================
--- pojo/tags/2.1.0.CR4/src/test/resources/log4j.xml (rev 0)
+++ pojo/tags/2.1.0.CR4/src/test/resources/log4j.xml 2008-02-21 04:28:29 UTC (rev 5370)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 5286 2008-02-01 12:13:53Z mircea.markus $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="output/jbosscache.log"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+ <param name="Threshold" value="DEBUG"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="TRACE"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c{1}] (%t) %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.cache">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss.tm">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--<appender-ref ref="CONSOLE"/>-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5369 - in pojo/branches/2.1: src/test/java/org/jboss/cache/pojo and 3 other directories.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 23:27:37 -0500 (Wed, 20 Feb 2008)
New Revision: 5369
Added:
pojo/branches/2.1/src/test/resources/META-INF/
pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml
pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml
pojo/branches/2.1/src/test/resources/log4j.xml
Modified:
pojo/branches/2.1/pom.xml
pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java
pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java
Log:
Reenable concurrent tests
Move pojo specific configs from core cache to pojo cache
Prepare for CR4
Modified: pojo/branches/2.1/pom.xml
===================================================================
--- pojo/branches/2.1/pom.xml 2008-02-21 04:22:10 UTC (rev 5368)
+++ pojo/branches/2.1/pom.xml 2008-02-21 04:27:37 UTC (rev 5369)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<jbosscache-pojo-version>2.1.0.CR4</jbosscache-pojo-version>
- <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
+ <jbosscache-core-version>2.1.0.CR4</jbosscache-core-version>
<jboss.aop.version>2.0.0.CR3</jboss.aop.version>
</properties>
<parent>
Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java
===================================================================
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-21 04:22:10 UTC (rev 5368)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-21 04:27:37 UTC (rev 5369)
@@ -34,7 +34,7 @@
* @version $Revision$
* @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004
*/
-@Test(groups = {"functional"}, enabled = false)
+@Test(groups = {"functional"})
public class LocalConcurrentTest
{
static PojoCache cache_;
Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java
===================================================================
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-21 04:22:10 UTC (rev 5368)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-21 04:27:37 UTC (rev 5369)
@@ -34,7 +34,7 @@
* @version $Revision$
* @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004
*/
-@Test(groups = {"functional"}, enabled = false)
+@Test(groups = {"functional"})
public class LocalConcurrentTest
{
static PojoCache cache_;
Added: pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml
===================================================================
--- pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml (rev 0)
+++ pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml 2008-02-21 04:27:37 UTC (rev 5369)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <UDP mcast_addr="228.10.10.10"
+ mcast_port="45588"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ ip_ttl="2"
+ enable_bundling="false"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="20000000" min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">20000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+ <!-- Specific eviction policy configurations. This is LRU -->
+ <!--
+ PojoCache passivation only allows configuration of global region. If you need to
+ configure multiple regions, you can turn on the marshalling region such that
+ internal JBoss region is stored under the individual region.
+ -->
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">3</attribute>
+ <!-- This defaults to 200000 if not specified -->
+ <attribute name="eventQueueSize">200000</attribute>
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+
+ <!-- Cache wide default -->
+ <region name="/_default_">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">3</attribute>
+ </region>
+ </config>
+ </attribute>
+
+ <!-- Cache Loader configuration block -->
+ <attribute name="CacheLoaderConfig">
+ <config>
+ <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
+ <passivation>true</passivation>
+ <preload>/</preload>
+ <shared>false</shared>
+
+ <!-- we can now have multiple cache loaders, which get chained -->
+ <cacheloader>
+ <class>org.jboss.cache.loader.FileCacheLoader</class>
+ <!-- same as the old CacheLoaderConfig attribute
+ location=/tmp this can be part of the properties.
+ location=/tmp/JBossCacheFileCacheLoader
+ -->
+ <properties>
+ location=pojoloader
+ </properties>
+ <!-- whether the cache loader writes are asynchronous -->
+ <async>false</async>
+ <!-- only one cache loader in the chain may set fetchPersistentState to true.
+ An exception is thrown if more than one cache loader sets this to true. -->
+ <fetchPersistentState>true</fetchPersistentState>
+ <!-- determines whether this cache loader ignores writes - defaults to false. -->
+ <ignoreModifications>false</ignoreModifications>
+ </cacheloader>
+
+ </config>
+ </attribute>
+
+ </mbean>
+
+
+</server>
Added: pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml
===================================================================
--- pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml (rev 0)
+++ pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml 2008-02-21 04:27:37 UTC (rev 5369)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <UDP mcast_addr="228.10.10.10"
+ mcast_port="45588"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ ip_ttl="2"
+ enable_bundling="false"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="20000000" min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">20000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+ <!-- Specific eviction policy configurations. This is LRU -->
+ <!--
+ PojoCache passivation only allows configuration of global region. If you need to
+ configure multiple regions, you can turn on the marshalling region such that
+ internal JBoss region is stored under the individual region.
+ -->
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">3</attribute>
+ <!-- This defaults to 200000 if not specified -->
+ <attribute name="eventQueueSize">200000</attribute>
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+
+ <!-- Cache wide default -->
+ <region name="/_default_">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">3</attribute>
+ </region>
+ </config>
+ </attribute>
+
+ <!-- Cache Loader configuration block -->
+ <attribute name="CacheLoaderConfig">
+ <config>
+ <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
+ <passivation>true</passivation>
+ <preload>/</preload>
+ <shared>false</shared>
+
+ <!-- we can now have multiple cache loaders, which get chained -->
+ <cacheloader>
+ <class>org.jboss.cache.loader.FileCacheLoader</class>
+ <!-- same as the old CacheLoaderConfig attribute
+ location=/tmp this can be part of the properties.
+ location=/tmp/JBossCacheFileCacheLoader
+ -->
+ <properties>
+ location=pojoloader2
+ </properties>
+ <!-- whether the cache loader writes are asynchronous -->
+ <async>false</async>
+ <!-- only one cache loader in the chain may set fetchPersistentState to true.
+ An exception is thrown if more than one cache loader sets this to true. -->
+ <fetchPersistentState>true</fetchPersistentState>
+ <!-- determines whether this cache loader ignores writes - defaults to false. -->
+ <ignoreModifications>false</ignoreModifications>
+ </cacheloader>
+
+ </config>
+ </attribute>
+
+ </mbean>
+
+
+</server>
Added: pojo/branches/2.1/src/test/resources/log4j.xml
===================================================================
--- pojo/branches/2.1/src/test/resources/log4j.xml (rev 0)
+++ pojo/branches/2.1/src/test/resources/log4j.xml 2008-02-21 04:27:37 UTC (rev 5369)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 5286 2008-02-01 12:13:53Z mircea.markus $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="File" value="output/jbosscache.log"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+ <param name="Threshold" value="DEBUG"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="TRACE"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c{1}] (%t) %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.cache">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss.tm">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--<appender-ref ref="CONSOLE"/>-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5368 - in core/trunk: assembly and 5 other directories.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 23:22:10 -0500 (Wed, 20 Feb 2008)
New Revision: 5368
Added:
core/trunk/src/main/etc/
core/trunk/src/main/etc/META-INF/
core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml
core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml
core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml
core/trunk/src/main/etc/META-INF/local-cache-service.xml
core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml
core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml
core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml
core/trunk/src/main/etc/cache-config.xml
core/trunk/src/main/etc/cache-jdbc.properties
core/trunk/src/main/etc/dependencies.xml
core/trunk/src/main/etc/jndi.properties
core/trunk/src/test/resources/META-INF/buddy-replication-cache-service.xml
core/trunk/src/test/resources/META-INF/local-service.xml
core/trunk/src/test/resources/cache-jdbc.properties
Removed:
core/trunk/src/main/etc/META-INF/
core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml
core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml
core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml
core/trunk/src/main/etc/META-INF/local-cache-service.xml
core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml
core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml
core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml
core/trunk/src/main/etc/cache-config.xml
core/trunk/src/main/etc/cache-jdbc.properties
core/trunk/src/main/etc/dependencies.xml
core/trunk/src/main/etc/jndi.properties
core/trunk/src/main/resources/
Modified:
core/trunk/assembly/all.xml
core/trunk/assembly/bin.xml
core/trunk/pom.xml
Log:
Merge packaging fix from 2.1.0.CR4
Modified: core/trunk/assembly/all.xml
===================================================================
--- core/trunk/assembly/all.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/assembly/all.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -23,7 +23,7 @@
<!-- resources -->
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/etc</directory>
<outputDirectory>etc</outputDirectory>
</fileSet>
Modified: core/trunk/assembly/bin.xml
===================================================================
--- core/trunk/assembly/bin.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/assembly/bin.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -22,7 +22,7 @@
<!-- resources -->
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/etc</directory>
<outputDirectory>etc</outputDirectory>
</fileSet>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/pom.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-common-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
@@ -128,12 +128,30 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <mainClass>org.jboss.cache.Version</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
<executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
+ <execution>
+ <id>build-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
</executions>
</plugin>
<!-- the docbook generation plugin for the user guide -->
Copied: core/trunk/src/main/etc (from rev 5367, core/tags/2.1.0.CR4/src/main/etc)
Copied: core/trunk/src/main/etc/META-INF (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF)
Deleted: core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/buddy-replication-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample TreeCache Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
-
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=testTreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">REPL_SYNC</attribute>
-
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties.
- ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
- -->
- <attribute name="ClusterConfig">
- <config>
- <TCP recv_buf_size="20000000" use_send_queues="false"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- enable_unicast_bundling="true"
- enable_diagnostics="true"
-
- use_concurrent_stack="true"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="4"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
-
- <!--<PING timeout="2000" num_initial_members="3"/>-->
- <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000"
- join_retry_timeout="2000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </attribute>
-
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">15000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">10000</attribute>
-
-
- <!-- Buddy Replication config -->
- <attribute name="BuddyReplicationConfig">
- <config>
- <buddyReplicationEnabled>true</buddyReplicationEnabled>
- <!-- these are the default values anyway -->
- <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
- <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
- each node will *try* to select a buddy on a different physical host. If not able to do so though,
- it will fall back to colocated nodes. -->
- <buddyLocatorProperties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </buddyLocatorProperties>
-
- <!-- A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
- the same pool name (falling back to other buddies if not available). This allows the sysdmin to hint at
- backup buddies are picked, so for example, nodes may be hinted topick buddies on a different physical rack
- or power supply for added fault tolerance. -->
- <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
- <!-- communication timeout for inter-buddy group organisation messages (such as assigning to and removing
- from groups -->
- <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
- <!-- the following three elements, all relating to data gravitation, default to false -->
- <!-- Should data gravitation be attempted whenever there is a cache miss on finding a node?
-If false, data will only be gravitated if an Option is set enabling it -->
- <autoDataGravitation>false</autoDataGravitation>
- <!-- removes data on remote caches' trees and backup subtrees when gravitated to a new data owner -->
- <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
- <!-- search backup subtrees as well for data when gravitating. Results in backup nodes being able to
- answer data gravitation requests. -->
- <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
-
- </config>
- </attribute>
- </mbean>
-
-
-</server>
Copied: core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/buddy-replication-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/buddy-replication-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=testTreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">15000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+
+ <!-- Buddy Replication config -->
+ <attribute name="BuddyReplicationConfig">
+ <config>
+ <buddyReplicationEnabled>true</buddyReplicationEnabled>
+ <!-- these are the default values anyway -->
+ <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
+ <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
+ each node will *try* to select a buddy on a different physical host. If not able to do so though,
+ it will fall back to colocated nodes. -->
+ <buddyLocatorProperties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </buddyLocatorProperties>
+
+ <!-- A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
+ the same pool name (falling back to other buddies if not available). This allows the sysdmin to hint at
+ backup buddies are picked, so for example, nodes may be hinted topick buddies on a different physical rack
+ or power supply for added fault tolerance. -->
+ <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+ <!-- communication timeout for inter-buddy group organisation messages (such as assigning to and removing
+ from groups -->
+ <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+ <!-- the following three elements, all relating to data gravitation, default to false -->
+ <!-- Should data gravitation be attempted whenever there is a cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it -->
+ <autoDataGravitation>false</autoDataGravitation>
+ <!-- removes data on remote caches' trees and backup subtrees when gravitated to a new data owner -->
+ <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+ <!-- search backup subtrees as well for data when gravitating. Results in backup nodes being able to
+ answer data gravitation requests. -->
+ <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
+
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Deleted: core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample TreeCache Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=TreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
-
- <!-- Specific eviction policy configurations. This is LRU -->
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">5</attribute>
- <!-- This defaults to 200000 if not specified -->
- <attribute name="eventQueueSize">200000</attribute>
- <!-- Name of the DEFAULT eviction policy class. -->
- <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
-
-
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">3</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">100</attribute>
- <attribute name="timeToLiveSeconds">3</attribute>
- </region>
- </config>
- </attribute>
-
- <!-- Cache Passivation for Tree Cache
- On pasivation, The objects are written to the backend store on eviction if CacheLoaderPassivation
- is true, otheriwse the objects are persisted.
- On activation, the objects are restored in the memory cache and removed from the cache loader
- if CacheLoaderPassivation is true, otherwise the objects are only loaded from the cache loader -->
- <attribute name="CacheLoaderConfiguration">
- <config>
- <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
- <passivation>false</passivation>
- <preload>/</preload>
- <shared>false</shared>
-
- <!-- we can now have multiple cache loaders, which get chained -->
- <cacheloader>
- <class>org.jboss.cache.loader.JDBCCacheLoader</class>
- <!-- same as the old CacheLoaderConfig attribute -->
- <properties>
- cache.jdbc.table.name=jbosscache
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=true
- cache.jdbc.table.primarykey=jbosscache_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=varchar(255)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=blob
- cache.jdbc.parent.column=parent
- cache.jdbc.driver=com.mysql.jdbc.Driver
- cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
- cache.jdbc.user=root
- cache.jdbc.password=
- cache.jdbc.sql-concat=concat(1,2)
- </properties>
- <!-- whether the cache loader writes are asynchronous -->
- <async>false</async>
- <!-- only one cache loader in the chain may set fetchPersistentState to true.
- An exception is thrown if more than one cache loader sets this to true. -->
- <fetchPersistentState>true</fetchPersistentState>
- <!-- determines whether this cache loader ignores writes - defaults to false. -->
- <ignoreModifications>false</ignoreModifications>
- <!-- if set to true, purges the contents of this cache loader when the cache starts up.
- Defaults to false. -->
- <purgeOnStartup>false</purgeOnStartup>
- </cacheloader>
- </config>
- </attribute>
-
- </mbean>
-
-
-</server>
Copied: core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/cacheloader-enabled-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+ <!-- Specific eviction policy configurations. This is LRU -->
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">5</attribute>
+ <!-- This defaults to 200000 if not specified -->
+ <attribute name="eventQueueSize">200000</attribute>
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+
+ <!-- Cache wide default -->
+ <region name="/_default_">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">3</attribute>
+ </region>
+ <region name="/org/jboss/test/data">
+ <attribute name="maxNodes">100</attribute>
+ <attribute name="timeToLiveSeconds">3</attribute>
+ </region>
+ </config>
+ </attribute>
+
+ <!-- Cache Passivation for Tree Cache
+ On pasivation, The objects are written to the backend store on eviction if CacheLoaderPassivation
+ is true, otheriwse the objects are persisted.
+ On activation, the objects are restored in the memory cache and removed from the cache loader
+ if CacheLoaderPassivation is true, otherwise the objects are only loaded from the cache loader -->
+ <attribute name="CacheLoaderConfiguration">
+ <config>
+ <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
+ <passivation>false</passivation>
+ <preload>/</preload>
+ <shared>false</shared>
+
+ <!-- we can now have multiple cache loaders, which get chained -->
+ <cacheloader>
+ <class>org.jboss.cache.loader.JDBCCacheLoader</class>
+ <!-- same as the old CacheLoaderConfig attribute -->
+ <properties>
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
+ cache.jdbc.table.primarykey=jbosscache_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=varchar(255)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=blob
+ cache.jdbc.parent.column=parent
+ cache.jdbc.driver=com.mysql.jdbc.Driver
+ cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
+ cache.jdbc.user=root
+ cache.jdbc.password=
+ cache.jdbc.sql-concat=concat(1,2)
+ </properties>
+ <!-- whether the cache loader writes are asynchronous -->
+ <async>false</async>
+ <!-- only one cache loader in the chain may set fetchPersistentState to true.
+ An exception is thrown if more than one cache loader sets this to true. -->
+ <fetchPersistentState>true</fetchPersistentState>
+ <!-- determines whether this cache loader ignores writes - defaults to false. -->
+ <ignoreModifications>false</ignoreModifications>
+ <!-- if set to true, purges the contents of this cache loader when the cache starts up.
+ Defaults to false. -->
+ <purgeOnStartup>false</purgeOnStartup>
+ </cacheloader>
+ </config>
+ </attribute>
+
+ </mbean>
+
+
+</server>
Deleted: core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/eviction-enabled-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!--
-Sample JBoss Cache Service Configuration that hightlights various
-eviction configurations. By default LRUPolicy is enabled, by this can be
-changed by commenting it out and uncommenting another present
-eviction policy.
--->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines JBoss Cache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=Cache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
-
- <!-- Specific eviction policy configurations. This is LRU -->
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">5</attribute>
- <!-- This defaults to 200000 if not specified -->
- <attribute name="eventQueueSize">200000</attribute>
- <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
-
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </region>
- <region name="/org/jboss/data">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">5</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
- </region>
- <region name="/test">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
- </region>
- <region name="/maxAgeTest">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">8</attribute>
- <attribute name="maxAgeSeconds">10</attribute>
- </region>
- </config>
- </attribute>
-
-
- <!--ElementSizePolicy eviction config-->
- <!--<attribute name="EvictionPolicyConfig">-->
- <!--<config>-->
- <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
- <!-- This defaults to 200000 if not specified -->
- <!--<attribute name="eventQueueSize">200000</attribute>-->
- <!-- Name of the DEFAULT eviction policy class. -->
- <!--<attribute name="policyClass">org.jboss.cache.eviction.ElementSizePolicy</attribute>-->
-
- <!-- Cache wide default -->
- <!--<region name="/_default_">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--<attribute name="maxElementsPerNode">100</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/data">-->
- <!--<attribute name="maxNodes">10</attribute>-->
- <!--<attribute name="maxElementsPerNode">20</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/test/data">-->
- <!--<attribute name="maxElementsPerNode">5</attribute>-->
- <!--</region>-->
- <!--<region name="/test/">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--<attribute name="maxElementsPerNode">1</attribute>-->
- <!--</region>-->
- <!--</config>-->
- <!--</attribute>-->
-
- <!-- ExpirationPolicy eviction policy configurations. -->
- <!--<attribute name="EvictionPolicyConfig">-->
- <!--<config>-->
- <!-- One second is a good default -->
- <!--<attribute name="wakeUpIntervalSeconds">1</attribute>-->
- <!-- This defaults to 200000 if not specified -->
- <!--<attribute name="eventQueueSize">200000</attribute>-->
- <!-- Name of the DEFAULT eviction policy class. -->
- <!--<attribute name="policyClass">org.jboss.cache.eviction.ExpirationPolicy</attribute>-->
-
- <!-- Cache wide default -->
- <!--<region name="/_default_">-->
- <!--</region>-->
- <!--<region name="/org/jboss/data">-->
- <!-- Removes the soonest to expire nodes to reduce the region size to at most 250 nodes -->
- <!--<attribute name="maxNodes">250</attribute>-->
- <!--</region>-->
- <!--</config>-->
- <!--</attribute>-->
-
- <!-- Specific eviction policy configurations. This is FIFOPolicy -->
- <!--<attribute name="EvictionPolicyConfig">-->
- <!--<config>-->
- <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
- <!-- This defaults to 200000 if not specified -->
- <!--<attribute name="eventQueueSize">200000</attribute>-->
- <!-- Name of the DEFAULT eviction policy class. -->
- <!--<attribute name="policyClass">org.jboss.cache.eviction.FIFOPolicy</attribute>-->
-
- <!-- Cache wide default -->
- <!--<region name="/_default_">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/data">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/test/data">-->
- <!--<attribute name="maxNodes">5</attribute>-->
- <!--</region>-->
- <!--<region name="/test/">-->
- <!--<attribute name="maxNodes">10000</attribute>-->
- <!--</region>-->
- <!--</config>-->
- <!--</attribute>-->
-
- <!-- Specific eviction policy configurations. This is LFUPolicy -->
- <!--<attribute name="EvictionPolicyConfig">-->
- <!--<config>-->
- <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
- <!-- This defaults to 200000 if not specified -->
- <!--<attribute name="eventQueueSize">200000</attribute>-->
-
- <!-- Cache wide default -->
- <!--<region name="/_default_" policyClass="org.jboss.cache.eviction.LFUPolicy">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--<attribute name="minNodes">10</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.LFUPolicy">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--<attribute name="minNodes">4000</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/test/data" policyClass="org.jboss.cache.eviction.LFUPolicy">-->
- <!--<attribute name="minNodes">5</attribute>-->
- <!--</region>-->
- <!--</config>-->
- <!--</attribute>-->
-
- <!-- Specific eviction policy configurations. This is MRUPolicy -->
- <!--<attribute name="EvictionPolicyConfig">-->
- <!--<config>-->
- <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
- <!-- This defaults to 200000 if not specified -->
- <!--<attribute name="eventQueueSize">200000</attribute>-->
- <!-- Name of the DEFAULT eviction policy class. -->
- <!--<attribute name="policyClass">org.jboss.cache.eviction.MRUPolicy</attribute>-->
-
-
- <!-- Cache wide default -->
- <!--<region name="/_default_">-->
- <!--<attribute name="maxNodes">100</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/data">-->
- <!--<attribute name="maxNodes">250</attribute>-->
- <!--</region>-->
- <!--<region name="/org/jboss/test/data">-->
- <!--<attribute name="maxNodes">6</attribute>-->
- <!--</region>-->
- <!--</config>-->
- <!--</attribute>-->
-
- <!-- Specific eviction policy configurations. This is LRU -->
- <!--<attribute name="EvictionPolicyConfig">-->
- <!--<config>-->
- <!--<attribute name="wakeUpIntervalSeconds">1</attribute>-->
- <!-- This defaults to 200000 if not specified -->
- <!--<attribute name="eventQueueSize">200000</attribute>-->
- <!--<attribute name="policyClass">org.jboss.cache.eviction.NullEvictionPolicy</attribute>-->
-
- <!-- Cache wide default -->
- <!--<region name="/_default_">-->
- <!--<attribute name="maxNodes">5000</attribute>-->
- <!--<attribute name="timeToLiveSeconds">1</attribute>-->
- <!--</region>-->
- <!--<region name="/test" policyClass="org.jboss.cache.eviction.NullEvictionPolicy">-->
- <!--<attribute name="maxNodes">10000</attribute>-->
- <!--<attribute name="timeToLiveSeconds">1</attribute>-->
- <!--</region>-->
- <!--<region name="/lru" policyClass="org.jboss.cache.eviction.LRUPolicy">-->
- <!--<attribute name="maxNodes">10000</attribute>-->
- <!--<attribute name="timeToLiveSeconds">1</attribute>-->
- <!--</region>-->
- <!--</config>-->
- <!--</attribute>-->
-
- </mbean>
-
-
-</server>
Copied: core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/eviction-enabled-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/eviction-enabled-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!--
+Sample JBoss Cache Service Configuration that hightlights various
+eviction configurations. By default LRUPolicy is enabled, by this can be
+changed by commenting it out and uncommenting another present
+eviction policy.
+-->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines JBoss Cache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=Cache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+ <!-- Specific eviction policy configurations. This is LRU -->
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">5</attribute>
+ <!-- This defaults to 200000 if not specified -->
+ <attribute name="eventQueueSize">200000</attribute>
+ <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+ <!-- Cache wide default -->
+ <region name="/_default_">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">1000</attribute>
+ </region>
+ <region name="/org/jboss/data">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">1000</attribute>
+ </region>
+ <region name="/org/jboss/test/data">
+ <attribute name="maxNodes">5</attribute>
+ <attribute name="timeToLiveSeconds">4</attribute>
+ </region>
+ <region name="/test">
+ <attribute name="maxNodes">10000</attribute>
+ <attribute name="timeToLiveSeconds">4</attribute>
+ </region>
+ <region name="/maxAgeTest">
+ <attribute name="maxNodes">10000</attribute>
+ <attribute name="timeToLiveSeconds">8</attribute>
+ <attribute name="maxAgeSeconds">10</attribute>
+ </region>
+ </config>
+ </attribute>
+
+
+ <!--ElementSizePolicy eviction config-->
+ <!--<attribute name="EvictionPolicyConfig">-->
+ <!--<config>-->
+ <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
+ <!-- This defaults to 200000 if not specified -->
+ <!--<attribute name="eventQueueSize">200000</attribute>-->
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <!--<attribute name="policyClass">org.jboss.cache.eviction.ElementSizePolicy</attribute>-->
+
+ <!-- Cache wide default -->
+ <!--<region name="/_default_">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--<attribute name="maxElementsPerNode">100</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/data">-->
+ <!--<attribute name="maxNodes">10</attribute>-->
+ <!--<attribute name="maxElementsPerNode">20</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/test/data">-->
+ <!--<attribute name="maxElementsPerNode">5</attribute>-->
+ <!--</region>-->
+ <!--<region name="/test/">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--<attribute name="maxElementsPerNode">1</attribute>-->
+ <!--</region>-->
+ <!--</config>-->
+ <!--</attribute>-->
+
+ <!-- ExpirationPolicy eviction policy configurations. -->
+ <!--<attribute name="EvictionPolicyConfig">-->
+ <!--<config>-->
+ <!-- One second is a good default -->
+ <!--<attribute name="wakeUpIntervalSeconds">1</attribute>-->
+ <!-- This defaults to 200000 if not specified -->
+ <!--<attribute name="eventQueueSize">200000</attribute>-->
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <!--<attribute name="policyClass">org.jboss.cache.eviction.ExpirationPolicy</attribute>-->
+
+ <!-- Cache wide default -->
+ <!--<region name="/_default_">-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/data">-->
+ <!-- Removes the soonest to expire nodes to reduce the region size to at most 250 nodes -->
+ <!--<attribute name="maxNodes">250</attribute>-->
+ <!--</region>-->
+ <!--</config>-->
+ <!--</attribute>-->
+
+ <!-- Specific eviction policy configurations. This is FIFOPolicy -->
+ <!--<attribute name="EvictionPolicyConfig">-->
+ <!--<config>-->
+ <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
+ <!-- This defaults to 200000 if not specified -->
+ <!--<attribute name="eventQueueSize">200000</attribute>-->
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <!--<attribute name="policyClass">org.jboss.cache.eviction.FIFOPolicy</attribute>-->
+
+ <!-- Cache wide default -->
+ <!--<region name="/_default_">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/data">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/test/data">-->
+ <!--<attribute name="maxNodes">5</attribute>-->
+ <!--</region>-->
+ <!--<region name="/test/">-->
+ <!--<attribute name="maxNodes">10000</attribute>-->
+ <!--</region>-->
+ <!--</config>-->
+ <!--</attribute>-->
+
+ <!-- Specific eviction policy configurations. This is LFUPolicy -->
+ <!--<attribute name="EvictionPolicyConfig">-->
+ <!--<config>-->
+ <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
+ <!-- This defaults to 200000 if not specified -->
+ <!--<attribute name="eventQueueSize">200000</attribute>-->
+
+ <!-- Cache wide default -->
+ <!--<region name="/_default_" policyClass="org.jboss.cache.eviction.LFUPolicy">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--<attribute name="minNodes">10</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.LFUPolicy">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--<attribute name="minNodes">4000</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/test/data" policyClass="org.jboss.cache.eviction.LFUPolicy">-->
+ <!--<attribute name="minNodes">5</attribute>-->
+ <!--</region>-->
+ <!--</config>-->
+ <!--</attribute>-->
+
+ <!-- Specific eviction policy configurations. This is MRUPolicy -->
+ <!--<attribute name="EvictionPolicyConfig">-->
+ <!--<config>-->
+ <!--<attribute name="wakeUpIntervalSeconds">3</attribute>-->
+ <!-- This defaults to 200000 if not specified -->
+ <!--<attribute name="eventQueueSize">200000</attribute>-->
+ <!-- Name of the DEFAULT eviction policy class. -->
+ <!--<attribute name="policyClass">org.jboss.cache.eviction.MRUPolicy</attribute>-->
+
+
+ <!-- Cache wide default -->
+ <!--<region name="/_default_">-->
+ <!--<attribute name="maxNodes">100</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/data">-->
+ <!--<attribute name="maxNodes">250</attribute>-->
+ <!--</region>-->
+ <!--<region name="/org/jboss/test/data">-->
+ <!--<attribute name="maxNodes">6</attribute>-->
+ <!--</region>-->
+ <!--</config>-->
+ <!--</attribute>-->
+
+ <!-- Specific eviction policy configurations. This is LRU -->
+ <!--<attribute name="EvictionPolicyConfig">-->
+ <!--<config>-->
+ <!--<attribute name="wakeUpIntervalSeconds">1</attribute>-->
+ <!-- This defaults to 200000 if not specified -->
+ <!--<attribute name="eventQueueSize">200000</attribute>-->
+ <!--<attribute name="policyClass">org.jboss.cache.eviction.NullEvictionPolicy</attribute>-->
+
+ <!-- Cache wide default -->
+ <!--<region name="/_default_">-->
+ <!--<attribute name="maxNodes">5000</attribute>-->
+ <!--<attribute name="timeToLiveSeconds">1</attribute>-->
+ <!--</region>-->
+ <!--<region name="/test" policyClass="org.jboss.cache.eviction.NullEvictionPolicy">-->
+ <!--<attribute name="maxNodes">10000</attribute>-->
+ <!--<attribute name="timeToLiveSeconds">1</attribute>-->
+ <!--</region>-->
+ <!--<region name="/lru" policyClass="org.jboss.cache.eviction.LRUPolicy">-->
+ <!--<attribute name="maxNodes">10000</attribute>-->
+ <!--<attribute name="timeToLiveSeconds">1</attribute>-->
+ <!--</region>-->
+ <!--</config>-->
+ <!--</attribute>-->
+
+ </mbean>
+
+
+</server>
Deleted: core/trunk/src/main/etc/META-INF/local-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/local-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/local-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample TreeCache Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=TreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
-
- <!-- Configure the TransactionManager -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
-
- </mbean>
-</server>
Copied: core/trunk/src/main/etc/META-INF/local-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/local-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/local-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/local-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+
+ <!-- Configure the TransactionManager -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+ </mbean>
+</server>
Deleted: core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample TreeCache Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
-
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=testTreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">REPL_SYNC</attribute>
-
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
-
- <!-- JGroups protocol stack properties.
- ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
- -->
- <attribute name="ClusterConfig">
- <config>
- <TCP recv_buf_size="20000000" use_send_queues="false"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- enable_unicast_bundling="true"
- enable_diagnostics="true"
-
- use_concurrent_stack="true"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="4"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
-
- <!--<PING timeout="2000" num_initial_members="3"/>-->
- <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000"
- join_retry_timeout="2000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000"
- min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </attribute>
-
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">15000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">10000</attribute>
-
-
- <!-- Buddy Replication config -->
- <attribute name="BuddyReplicationConfig">
- <config>
- <buddyReplicationEnabled>true</buddyReplicationEnabled>
- <!-- these are the default values anyway -->
- <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
- <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
- each node will *try* to select a buddy on a different physical host. If not able to do so though,
- it will fall back to colocated nodes. -->
- <buddyLocatorProperties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </buddyLocatorProperties>
-
- <!-- A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
- the same pool name (falling back to other buddies if not available). This allows the sysdmin to hint at
- backup buddies are picked, so for example, nodes may be hinted topick buddies on a different physical rack
- or power supply for added fault tolerance. -->
- <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
- <!-- communication timeout for inter-buddy group organisation messages (such as assigning to and removing
- from groups -->
- <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
- <!-- the following three elements, all relating to data gravitation, default to false -->
- <!-- Should data gravitation be attempted whenever there is a cache miss on finding a node?
-If false, data will only be gravitated if an Option is set enabling it -->
- <autoDataGravitation>false</autoDataGravitation>
- <!-- removes data on remote caches' trees and backup subtrees when gravitated to a new data owner -->
- <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
- <!-- search backup subtrees as well for data when gravitating. Results in backup nodes being able to
- answer data gravitation requests. -->
- <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
-
- </config>
- </attribute>
- </mbean>
-
-
-</server>
Copied: core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/multiplexer-enabled-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=testTreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">15000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+
+ <!-- Buddy Replication config -->
+ <attribute name="BuddyReplicationConfig">
+ <config>
+ <buddyReplicationEnabled>true</buddyReplicationEnabled>
+ <!-- these are the default values anyway -->
+ <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
+ <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
+ each node will *try* to select a buddy on a different physical host. If not able to do so though,
+ it will fall back to colocated nodes. -->
+ <buddyLocatorProperties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </buddyLocatorProperties>
+
+ <!-- A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
+ the same pool name (falling back to other buddies if not available). This allows the sysdmin to hint at
+ backup buddies are picked, so for example, nodes may be hinted topick buddies on a different physical rack
+ or power supply for added fault tolerance. -->
+ <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+ <!-- communication timeout for inter-buddy group organisation messages (such as assigning to and removing
+ from groups -->
+ <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+ <!-- the following three elements, all relating to data gravitation, default to false -->
+ <!-- Should data gravitation be attempted whenever there is a cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it -->
+ <autoDataGravitation>false</autoDataGravitation>
+ <!-- removes data on remote caches' trees and backup subtrees when gravitated to a new data owner -->
+ <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+ <!-- search backup subtrees as well for data when gravitating. Results in backup nodes being able to
+ answer data gravitation requests. -->
+ <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
+
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Deleted: core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/optimistically-locked-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample TreeCache Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=TreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
- <attribute name="FetchInMemoryState">false</attribute>
-
- <!-- Whether each interceptor should have an mbean
-registered to capture and display its statistics. -->
- <attribute name="UseInterceptorMbeans">true</attribute>
-
- <!--
- Node locking scheme:
- OPTIMISTIC
- PESSIMISTIC (default)
- -->
- <attribute name="NodeLockingScheme">Optimistic</attribute>
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">READ_COMMITTED</attribute>
-
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">10000</attribute>
-
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">1</attribute>
- <!-- Name of the DEFAULT eviction policy class.-->
- <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
-
- <region name="/_default_">
- <attribute name="maxNodes">10</attribute>
- <attribute name="timeToLiveSeconds">0</attribute>
- <attribute name="maxAgeSeconds">0</attribute>
- </region>
- <region name="/testingRegion">
- <attribute name="maxNodes">10</attribute>
- <attribute name="timeToLiveSeconds">0</attribute>
- <attribute name="maxAgeSeconds">0</attribute>
- </region>
- <region name="/timeBased">
- <attribute name="maxNodes">10</attribute>
- <attribute name="timeToLiveSeconds">1</attribute>
- <attribute name="maxAgeSeconds">1</attribute>
- </region>
- </config>
- </attribute>
-
- </mbean>
-</server>
Copied: core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/optimistically-locked-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/optimistically-locked-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+ <attribute name="FetchInMemoryState">false</attribute>
+
+ <!-- Whether each interceptor should have an mbean
+registered to capture and display its statistics. -->
+ <attribute name="UseInterceptorMbeans">true</attribute>
+
+ <!--
+ Node locking scheme:
+ OPTIMISTIC
+ PESSIMISTIC (default)
+ -->
+ <attribute name="NodeLockingScheme">Optimistic</attribute>
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">READ_COMMITTED</attribute>
+
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">1</attribute>
+ <!-- Name of the DEFAULT eviction policy class.-->
+ <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+ <region name="/_default_">
+ <attribute name="maxNodes">10</attribute>
+ <attribute name="timeToLiveSeconds">0</attribute>
+ <attribute name="maxAgeSeconds">0</attribute>
+ </region>
+ <region name="/testingRegion">
+ <attribute name="maxNodes">10</attribute>
+ <attribute name="timeToLiveSeconds">0</attribute>
+ <attribute name="maxAgeSeconds">0</attribute>
+ </region>
+ <region name="/timeBased">
+ <attribute name="maxNodes">10</attribute>
+ <attribute name="timeToLiveSeconds">1</attribute>
+ <attribute name="maxAgeSeconds">1</attribute>
+ </region>
+ </config>
+ </attribute>
+
+ </mbean>
+</server>
Deleted: core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/META-INF/total-replication-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample for total replication. -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
-
-
- <!-- ==================================================================== -->
- <!-- Defines TreeCache configuration -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
- name="jboss.cache:service=testTreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
-
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
- <attribute name="CacheMode">REPL_SYNC</attribute>
-
- <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
- cluster in order to find each other.
- -->
- <attribute name="ClusterName">JBossCache-Cluster</attribute>
-
- <!--Uncomment next three statements to enable JGroups multiplexer.
- This configuration is dependent on the JGroups multiplexer being
- registered in an MBean server such as JBossAS. -->
- <!--
- <depends>jgroups.mux:name=Multiplexer</depends>
- <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
- <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
- -->
-
- <!-- JGroups protocol stack properties.
- ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
- -->
- <attribute name="ClusterConfig">
- <config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="false"
- enable_diagnostics="true"
-
- use_concurrent_stack="true"
-
- thread_naming_pattern="pl"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
-
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </attribute>
-
-
- <!--
- The max amount of time (in milliseconds) we wait until the
- state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <attribute name="StateRetrievalTimeout">20000</attribute>
-
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">15000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">10000</attribute>
-
-
- </mbean>
-</server>
Copied: core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/META-INF/total-replication-cache-service.xml)
===================================================================
--- core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml (rev 0)
+++ core/trunk/src/main/etc/META-INF/total-replication-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample for total replication. -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=testTreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+ This configuration is dependent on the JGroups multiplexer being
+ registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <UDP mcast_addr="228.10.10.10"
+ mcast_port="45588"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ ip_ttl="2"
+ enable_bundling="false"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">15000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+
+ </mbean>
+</server>
Deleted: core/trunk/src/main/etc/cache-config.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/cache-config.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/cache-config.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
- name="jboss.cache:service=LabconnTreeCacheAop">
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
- </attribute>
- <attribute name="IsolationLevel">READ_COMMITTED</attribute>
-
- <attribute name="CacheMode">LOCAL</attribute>
-
- <attribute name="CacheLoaderConfig" replace="false">
- <config>
- <cacheloader>
- <class>org.jboss.cache.loader.bdbje.BdbjeCacheLoader</class>
- <properties>
- location=./
- </properties>
- </cacheloader>
- </config>
- </attribute>
- </mbean>
-</server>
Copied: core/trunk/src/main/etc/cache-config.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/cache-config.xml)
===================================================================
--- core/trunk/src/main/etc/cache-config.xml (rev 0)
+++ core/trunk/src/main/etc/cache-config.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
+ name="jboss.cache:service=LabconnTreeCacheAop">
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+ <attribute name="IsolationLevel">READ_COMMITTED</attribute>
+
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <attribute name="CacheLoaderConfig" replace="false">
+ <config>
+ <cacheloader>
+ <class>org.jboss.cache.loader.bdbje.BdbjeCacheLoader</class>
+ <properties>
+ location=./
+ </properties>
+ </cacheloader>
+ </config>
+ </attribute>
+ </mbean>
+</server>
Deleted: core/trunk/src/main/etc/cache-jdbc.properties
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/cache-jdbc.properties 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/cache-jdbc.properties 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,69 +0,0 @@
-##
-# Standard JBC table properties
-# The table name can also be prepended with schema name for the given table.
-# Even though there is an Sql92 standard syntax for this: <schema_name>.<table name>
-#schema has different meanings accross various DBMS: Oracle - user name; PointBase - database name
-# Microsoft SQL Server & DB2 - schema name corresponds to the catalog owner
-cache.jdbc.table.name=jbosscache
-cache.jdbc.table.create=true
-cache.jdbc.table.drop=false
-cache.jdbc.table.primarykey=jbosscache_pk
-cache.jdbc.fqn.column=fqn
-cache.jdbc.fqn.type=varchar(255)
-cache.jdbc.node.column=node
-cache.jdbc.node.type=blob
-cache.jdbc.parent.column=parent
-# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
-# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which
-#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
-cache.jdbc.sql-concat=1 || 2
-
-# JBoss Cache Table properties for Hypersonic, just overrides
-#cache.jdbc.node.type=OBJECT
-
-##
-# DataSource
-#cache.jdbc.datasource=DefaultDS
-
-##
-# JDBC driver specific properties
-
-# Hypersonic
-#cache.jdbc.node.type=OBJECT
-
-## MySql
-#cache.jdbc.driver=com.mysql.jdbc.Driver
-#cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
-#cache.jdbc.user=root
-#cache.jdbc.password=admin
-
-## Oracle
-#cache.jdbc.driver=oracle.jdbc.OracleDriver
-#cache.jdbc.url=jdbc:oracle:thin:@192.168.0.100:1521:JBOSSDB
-#cache.jdbc.user=jboss
-#cache.jdbc.password=sa
-
-## MS Sql Server
-#cache.jdbc.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
-#cache.jdbc.url=jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=jbossdb;SelectMethod=cursor
-#cache.jdbc.user=sa
-#cache.jdbc.password=
-#cache.jdbc.node.type=image
-
-## Pointbase
-#cache.jdbc.driver=com.pointbase.jdbc.jdbcUniversalDriver
-#cache.jdbc.url=jdbc:pointbase:server://localhost:9092/jboss,new
-#cache.jdbc.user=PBPUBLIC
-#cache.jdbc.password=PBPUBLIC
-
-## PostgreSQL
-#cache.jdbc.driver = org.postgresql.Driver
-#cache.jdbc.url=jdbc:postgresql://192.168.0.100:5432/jbossdb
-#cache.jdbc.user=postgres
-#cache.jdbc.password=admin
-
-## Derby
-cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
-cache.jdbc.url=jdbc:derby:jbossdb;create=true
-cache.jdbc.user=user1
-cache.jdbc.password=user1
\ No newline at end of file
Copied: core/trunk/src/main/etc/cache-jdbc.properties (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/cache-jdbc.properties)
===================================================================
--- core/trunk/src/main/etc/cache-jdbc.properties (rev 0)
+++ core/trunk/src/main/etc/cache-jdbc.properties 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,69 @@
+##
+# Standard JBC table properties
+# The table name can also be prepended with schema name for the given table.
+# Even though there is an Sql92 standard syntax for this: <schema_name>.<table name>
+#schema has different meanings accross various DBMS: Oracle - user name; PointBase - database name
+# Microsoft SQL Server & DB2 - schema name corresponds to the catalog owner
+cache.jdbc.table.name=jbosscache
+cache.jdbc.table.create=true
+cache.jdbc.table.drop=false
+cache.jdbc.table.primarykey=jbosscache_pk
+cache.jdbc.fqn.column=fqn
+cache.jdbc.fqn.type=varchar(255)
+cache.jdbc.node.column=node
+cache.jdbc.node.type=blob
+cache.jdbc.parent.column=parent
+# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
+# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which
+#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
+cache.jdbc.sql-concat=1 || 2
+
+# JBoss Cache Table properties for Hypersonic, just overrides
+#cache.jdbc.node.type=OBJECT
+
+##
+# DataSource
+#cache.jdbc.datasource=DefaultDS
+
+##
+# JDBC driver specific properties
+
+# Hypersonic
+#cache.jdbc.node.type=OBJECT
+
+## MySql
+#cache.jdbc.driver=com.mysql.jdbc.Driver
+#cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
+#cache.jdbc.user=root
+#cache.jdbc.password=admin
+
+## Oracle
+#cache.jdbc.driver=oracle.jdbc.OracleDriver
+#cache.jdbc.url=jdbc:oracle:thin:@192.168.0.100:1521:JBOSSDB
+#cache.jdbc.user=jboss
+#cache.jdbc.password=sa
+
+## MS Sql Server
+#cache.jdbc.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+#cache.jdbc.url=jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=jbossdb;SelectMethod=cursor
+#cache.jdbc.user=sa
+#cache.jdbc.password=
+#cache.jdbc.node.type=image
+
+## Pointbase
+#cache.jdbc.driver=com.pointbase.jdbc.jdbcUniversalDriver
+#cache.jdbc.url=jdbc:pointbase:server://localhost:9092/jboss,new
+#cache.jdbc.user=PBPUBLIC
+#cache.jdbc.password=PBPUBLIC
+
+## PostgreSQL
+#cache.jdbc.driver = org.postgresql.Driver
+#cache.jdbc.url=jdbc:postgresql://192.168.0.100:5432/jbossdb
+#cache.jdbc.user=postgres
+#cache.jdbc.password=admin
+
+## Derby
+cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
+cache.jdbc.url=jdbc:derby:jbossdb;create=true
+cache.jdbc.user=user1
+cache.jdbc.password=user1
\ No newline at end of file
Deleted: core/trunk/src/main/etc/dependencies.xml
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/dependencies.xml 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/dependencies.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,114 +0,0 @@
-<!--
-Describes the version(s) of the libraries JBossCache depends on
-Author: Bela Ban
-Version: $Id$
- -->
-
-<dependencies>
- <jdk>1.4</jdk>
-
- <lib name="beanshell">
- <jar>bsh-2.0b4.jar</jar>
- <version>1.3.0</version>
- <version>2.0b4</version>
- <description>Embeddable Java source interpreter. Used in distribution demo. </description>
- </lib>
-
- <lib name="commons-logging">
- <jar>commons-logging.jar</jar>
- <version>1.0.3</version>
- <description>Apache commons logging. Used in logging now.</description>
- </lib>
-
- <lib name="concurrent">
- <jar>concurrent.jar</jar>
- <version>1.3.4</version>
- <description>Doug Lea's concurrent package.</description>
- </lib>
-
- <lib name="javassist">
- <jar>javassist.jar</jar>
- <version>3.1RC2</version>
- <description>Simple Java bytecode manipulation. Used by Aop.</description>
- </lib>
-
- <lib name="qdox">
- <jar>qdox.jar</jar>
- <version>1.4</version>
- <description>Parser for annotation used in Aop.</description>
- </lib>
-
- <lib name="jboss-aop">
- <jar>jboss-aop.jar</jar>
- <version>1.3.5</version>
- <description>Standalone JBoss Aop.</description>
- </lib>
-
- <lib name="jboss-aop-15">
- <jar>jboss-aop-jdk50.jar</jar>
- <version>1.3.5</version>
- <description>Standalone JBoss Aop for JDK50.</description>
- </lib>
-
- <lib name="jboss-common">
- <jar>jboss-common.jar</jar>
- <version>4.0.3</version>
- <description>JBoss common classes</description>
- </lib>
-
- <lib name="jboss-j2ee">
- <jar>jboss-j2ee.jar</jar>
- <version>4.0.3</version>
- <description>j2ee interfaces</description>
- </lib>
-
- <lib name="jboss-jmx">
- <jar>jboss-jmx.jar</jar>
- <version>4.0.3</version>
- <description>jmx implementaiton</description>
- </lib>
-
- <lib name="jboss-minimal">
- <jar>jboss-minimal.jar</jar>
- <version>4.0.3</version>
- <description></description>
- </lib>
-
- <lib name="jboss-system">
- <jar>jboss-system.jar</jar>
- <version>4.0.3</version>
- <description></description>
- </lib>
-
- <lib name="jgroups">
- <jar>jgroups.jar</jar>
- <version>2.2.7</version>
- <version>2.2.8</version>
- <description>Reliable messaging library. Used in replication.</description>
- </lib>
-
- <lib name="junit">
- <jar>junit.jar</jar>
- <version>3.8.1</version>
- <description>Unit testing framework. Used for examples.</description>
- </lib>
-
- <lib name="sleepycat">
- <jar>sleepycat/je.jar</jar>
- <version>1.7.0</version>
- <version>2.0.54</version>
- <description>Embeded DB. Used for JE cache loader.</description>
- </lib>
-
- <lib name="trove">
- <jar>trove.jar</jar>
- <version>1.0.2</version>
- <description>High performance collections for Java. Used by Aop.</description>
- </lib>
-
-</dependencies>
-
-
-
-
-
Copied: core/trunk/src/main/etc/dependencies.xml (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/dependencies.xml)
===================================================================
--- core/trunk/src/main/etc/dependencies.xml (rev 0)
+++ core/trunk/src/main/etc/dependencies.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,114 @@
+<!--
+Describes the version(s) of the libraries JBossCache depends on
+Author: Bela Ban
+Version: $Id$
+ -->
+
+<dependencies>
+ <jdk>1.4</jdk>
+
+ <lib name="beanshell">
+ <jar>bsh-2.0b4.jar</jar>
+ <version>1.3.0</version>
+ <version>2.0b4</version>
+ <description>Embeddable Java source interpreter. Used in distribution demo. </description>
+ </lib>
+
+ <lib name="commons-logging">
+ <jar>commons-logging.jar</jar>
+ <version>1.0.3</version>
+ <description>Apache commons logging. Used in logging now.</description>
+ </lib>
+
+ <lib name="concurrent">
+ <jar>concurrent.jar</jar>
+ <version>1.3.4</version>
+ <description>Doug Lea's concurrent package.</description>
+ </lib>
+
+ <lib name="javassist">
+ <jar>javassist.jar</jar>
+ <version>3.1RC2</version>
+ <description>Simple Java bytecode manipulation. Used by Aop.</description>
+ </lib>
+
+ <lib name="qdox">
+ <jar>qdox.jar</jar>
+ <version>1.4</version>
+ <description>Parser for annotation used in Aop.</description>
+ </lib>
+
+ <lib name="jboss-aop">
+ <jar>jboss-aop.jar</jar>
+ <version>1.3.5</version>
+ <description>Standalone JBoss Aop.</description>
+ </lib>
+
+ <lib name="jboss-aop-15">
+ <jar>jboss-aop-jdk50.jar</jar>
+ <version>1.3.5</version>
+ <description>Standalone JBoss Aop for JDK50.</description>
+ </lib>
+
+ <lib name="jboss-common">
+ <jar>jboss-common.jar</jar>
+ <version>4.0.3</version>
+ <description>JBoss common classes</description>
+ </lib>
+
+ <lib name="jboss-j2ee">
+ <jar>jboss-j2ee.jar</jar>
+ <version>4.0.3</version>
+ <description>j2ee interfaces</description>
+ </lib>
+
+ <lib name="jboss-jmx">
+ <jar>jboss-jmx.jar</jar>
+ <version>4.0.3</version>
+ <description>jmx implementaiton</description>
+ </lib>
+
+ <lib name="jboss-minimal">
+ <jar>jboss-minimal.jar</jar>
+ <version>4.0.3</version>
+ <description></description>
+ </lib>
+
+ <lib name="jboss-system">
+ <jar>jboss-system.jar</jar>
+ <version>4.0.3</version>
+ <description></description>
+ </lib>
+
+ <lib name="jgroups">
+ <jar>jgroups.jar</jar>
+ <version>2.2.7</version>
+ <version>2.2.8</version>
+ <description>Reliable messaging library. Used in replication.</description>
+ </lib>
+
+ <lib name="junit">
+ <jar>junit.jar</jar>
+ <version>3.8.1</version>
+ <description>Unit testing framework. Used for examples.</description>
+ </lib>
+
+ <lib name="sleepycat">
+ <jar>sleepycat/je.jar</jar>
+ <version>1.7.0</version>
+ <version>2.0.54</version>
+ <description>Embeded DB. Used for JE cache loader.</description>
+ </lib>
+
+ <lib name="trove">
+ <jar>trove.jar</jar>
+ <version>1.0.2</version>
+ <description>High performance collections for Java. Used by Aop.</description>
+ </lib>
+
+</dependencies>
+
+
+
+
+
Deleted: core/trunk/src/main/etc/jndi.properties
===================================================================
--- core/tags/2.1.0.CR4/src/main/etc/jndi.properties 2008-02-21 03:48:11 UTC (rev 5367)
+++ core/trunk/src/main/etc/jndi.properties 2008-02-21 04:22:10 UTC (rev 5368)
@@ -1,5 +0,0 @@
-# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
-#
-#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-#java.naming.provider.url=localhost:1099
\ No newline at end of file
Copied: core/trunk/src/main/etc/jndi.properties (from rev 5367, core/tags/2.1.0.CR4/src/main/etc/jndi.properties)
===================================================================
--- core/trunk/src/main/etc/jndi.properties (rev 0)
+++ core/trunk/src/main/etc/jndi.properties 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,5 @@
+# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
+#
+#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+#java.naming.provider.url=localhost:1099
\ No newline at end of file
Copied: core/trunk/src/test/resources/META-INF/buddy-replication-cache-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/test/resources/META-INF/buddy-replication-cache-service.xml)
===================================================================
--- core/trunk/src/test/resources/META-INF/buddy-replication-cache-service.xml (rev 0)
+++ core/trunk/src/test/resources/META-INF/buddy-replication-cache-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=testTreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">15000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+
+ <!-- Buddy Replication config -->
+ <attribute name="BuddyReplicationConfig">
+ <config>
+ <buddyReplicationEnabled>true</buddyReplicationEnabled>
+ <!-- these are the default values anyway -->
+ <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
+ <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
+ each node will *try* to select a buddy on a different physical host. If not able to do so though,
+ it will fall back to colocated nodes. -->
+ <buddyLocatorProperties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </buddyLocatorProperties>
+
+ <!-- A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
+ the same pool name (falling back to other buddies if not available). This allows the sysdmin to hint at
+ backup buddies are picked, so for example, nodes may be hinted topick buddies on a different physical rack
+ or power supply for added fault tolerance. -->
+ <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+ <!-- communication timeout for inter-buddy group organisation messages (such as assigning to and removing
+ from groups -->
+ <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+ <!-- the following three elements, all relating to data gravitation, default to false -->
+ <!-- Should data gravitation be attempted whenever there is a cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it -->
+ <autoDataGravitation>false</autoDataGravitation>
+ <!-- removes data on remote caches' trees and backup subtrees when gravitated to a new data owner -->
+ <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+ <!-- search backup subtrees as well for data when gravitating. Results in backup nodes being able to
+ answer data gravitation requests. -->
+ <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
+
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Copied: core/trunk/src/test/resources/META-INF/local-service.xml (from rev 5367, core/tags/2.1.0.CR4/src/test/resources/META-INF/local-service.xml)
===================================================================
--- core/trunk/src/test/resources/META-INF/local-service.xml (rev 0)
+++ core/trunk/src/test/resources/META-INF/local-service.xml 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+
+ <!-- Configure the TransactionManager -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+ </mbean>
+</server>
Copied: core/trunk/src/test/resources/cache-jdbc.properties (from rev 5367, core/tags/2.1.0.CR4/src/test/resources/cache-jdbc.properties)
===================================================================
--- core/trunk/src/test/resources/cache-jdbc.properties (rev 0)
+++ core/trunk/src/test/resources/cache-jdbc.properties 2008-02-21 04:22:10 UTC (rev 5368)
@@ -0,0 +1,69 @@
+##
+# Standard JBC table properties
+# The table name can also be prepended with schema name for the given table.
+# Even though there is an Sql92 standard syntax for this: <schema_name>.<table name>
+#schema has different meanings accross various DBMS: Oracle - user name; PointBase - database name
+# Microsoft SQL Server & DB2 - schema name corresponds to the catalog owner
+cache.jdbc.table.name=jbosscache
+cache.jdbc.table.create=true
+cache.jdbc.table.drop=false
+cache.jdbc.table.primarykey=jbosscache_pk
+cache.jdbc.fqn.column=fqn
+cache.jdbc.fqn.type=varchar(255)
+cache.jdbc.node.column=node
+cache.jdbc.node.type=blob
+cache.jdbc.parent.column=parent
+# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
+# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which
+#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
+cache.jdbc.sql-concat=1 || 2
+
+# JBoss Cache Table properties for Hypersonic, just overrides
+#cache.jdbc.node.type=OBJECT
+
+##
+# DataSource
+#cache.jdbc.datasource=DefaultDS
+
+##
+# JDBC driver specific properties
+
+# Hypersonic
+#cache.jdbc.node.type=OBJECT
+
+## MySql
+#cache.jdbc.driver=com.mysql.jdbc.Driver
+#cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
+#cache.jdbc.user=root
+#cache.jdbc.password=admin
+
+## Oracle
+#cache.jdbc.driver=oracle.jdbc.OracleDriver
+#cache.jdbc.url=jdbc:oracle:thin:@192.168.0.100:1521:JBOSSDB
+#cache.jdbc.user=jboss
+#cache.jdbc.password=sa
+
+## MS Sql Server
+#cache.jdbc.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+#cache.jdbc.url=jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=jbossdb;SelectMethod=cursor
+#cache.jdbc.user=sa
+#cache.jdbc.password=
+#cache.jdbc.node.type=image
+
+## Pointbase
+#cache.jdbc.driver=com.pointbase.jdbc.jdbcUniversalDriver
+#cache.jdbc.url=jdbc:pointbase:server://localhost:9092/jboss,new
+#cache.jdbc.user=PBPUBLIC
+#cache.jdbc.password=PBPUBLIC
+
+## PostgreSQL
+#cache.jdbc.driver = org.postgresql.Driver
+#cache.jdbc.url=jdbc:postgresql://192.168.0.100:5432/jbossdb
+#cache.jdbc.user=postgres
+#cache.jdbc.password=admin
+
+## Derby
+cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
+cache.jdbc.url=jdbc:derby:jbossdb;create=true
+cache.jdbc.user=user1
+cache.jdbc.password=user1
\ No newline at end of file
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5367 - in core/tags/2.1.0.CR4: assembly and 3 other directories.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 22:48:11 -0500 (Wed, 20 Feb 2008)
New Revision: 5367
Added:
core/tags/2.1.0.CR4/src/main/etc/
core/tags/2.1.0.CR4/src/test/resources/META-INF/buddy-replication-cache-service.xml
core/tags/2.1.0.CR4/src/test/resources/META-INF/local-service.xml
core/tags/2.1.0.CR4/src/test/resources/cache-jdbc.properties
Removed:
core/tags/2.1.0.CR4/src/main/resources/
Modified:
core/tags/2.1.0.CR4/assembly/all.xml
core/tags/2.1.0.CR4/assembly/bin.xml
core/tags/2.1.0.CR4/pom.xml
Log:
Fix packaging
- Move resources to etc
- Move descriptors used for testing to src/test/resources
- Move global jar plugin config local
Modified: core/tags/2.1.0.CR4/assembly/all.xml
===================================================================
--- core/tags/2.1.0.CR4/assembly/all.xml 2008-02-21 01:55:39 UTC (rev 5366)
+++ core/tags/2.1.0.CR4/assembly/all.xml 2008-02-21 03:48:11 UTC (rev 5367)
@@ -23,7 +23,7 @@
<!-- resources -->
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/etc</directory>
<outputDirectory>etc</outputDirectory>
</fileSet>
Modified: core/tags/2.1.0.CR4/assembly/bin.xml
===================================================================
--- core/tags/2.1.0.CR4/assembly/bin.xml 2008-02-21 01:55:39 UTC (rev 5366)
+++ core/tags/2.1.0.CR4/assembly/bin.xml 2008-02-21 03:48:11 UTC (rev 5367)
@@ -22,7 +22,7 @@
<!-- resources -->
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/etc</directory>
<outputDirectory>etc</outputDirectory>
</fileSet>
Modified: core/tags/2.1.0.CR4/pom.xml
===================================================================
--- core/tags/2.1.0.CR4/pom.xml 2008-02-21 01:55:39 UTC (rev 5366)
+++ core/tags/2.1.0.CR4/pom.xml 2008-02-21 03:48:11 UTC (rev 5367)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-common-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
@@ -128,12 +128,30 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <mainClass>org.jboss.cache.Version</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
<executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
+ <execution>
+ <id>build-test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
</executions>
</plugin>
<!-- the docbook generation plugin for the user guide -->
Copied: core/tags/2.1.0.CR4/src/main/etc (from rev 5363, core/tags/2.1.0.CR4/src/main/resources)
Added: core/tags/2.1.0.CR4/src/test/resources/META-INF/buddy-replication-cache-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/test/resources/META-INF/buddy-replication-cache-service.xml (rev 0)
+++ core/tags/2.1.0.CR4/src/test/resources/META-INF/buddy-replication-cache-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
+
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=testTreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+ <!--
+ Configure the TransactionManager
+ -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+
+ <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a
+ cluster in order to find each other.
+ -->
+ <attribute name="ClusterName">JBossCache-Cluster</attribute>
+
+ <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS. -->
+ <!--
+ <depends>jgroups.mux:name=Multiplexer</depends>
+ <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
+ -->
+
+ <!-- JGroups protocol stack properties.
+ ClusterConfig isn't used if the multiplexer is enabled and successfully initialized.
+ -->
+ <attribute name="ClusterConfig">
+ <config>
+ <TCP recv_buf_size="20000000" use_send_queues="false"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true"
+ enable_diagnostics="true"
+
+ use_concurrent_stack="true"
+
+ thread_naming_pattern="pl"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="4"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+
+ <!--<PING timeout="2000" num_initial_members="3"/>-->
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <!--<UNICAST timeout="30,60,120,300,600,1200,2400,3600"/>-->
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000"
+ min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </attribute>
+
+
+
+ <!--
+ The max amount of time (in milliseconds) we wait until the
+ state (ie. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <attribute name="StateRetrievalTimeout">20000</attribute>
+
+ <!--
+ Number of milliseconds to wait until all responses for a
+ synchronous call have been received.
+ -->
+ <attribute name="SyncReplTimeout">15000</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">10000</attribute>
+
+
+ <!-- Buddy Replication config -->
+ <attribute name="BuddyReplicationConfig">
+ <config>
+ <buddyReplicationEnabled>true</buddyReplicationEnabled>
+ <!-- these are the default values anyway -->
+ <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass>
+ <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
+ each node will *try* to select a buddy on a different physical host. If not able to do so though,
+ it will fall back to colocated nodes. -->
+ <buddyLocatorProperties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </buddyLocatorProperties>
+
+ <!-- A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
+ the same pool name (falling back to other buddies if not available). This allows the sysdmin to hint at
+ backup buddies are picked, so for example, nodes may be hinted topick buddies on a different physical rack
+ or power supply for added fault tolerance. -->
+ <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+ <!-- communication timeout for inter-buddy group organisation messages (such as assigning to and removing
+ from groups -->
+ <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+ <!-- the following three elements, all relating to data gravitation, default to false -->
+ <!-- Should data gravitation be attempted whenever there is a cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it -->
+ <autoDataGravitation>false</autoDataGravitation>
+ <!-- removes data on remote caches' trees and backup subtrees when gravitated to a new data owner -->
+ <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+ <!-- search backup subtrees as well for data when gravitating. Results in backup nodes being able to
+ answer data gravitation requests. -->
+ <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees>
+
+ </config>
+ </attribute>
+ </mbean>
+
+
+</server>
Added: core/tags/2.1.0.CR4/src/test/resources/META-INF/local-service.xml
===================================================================
--- core/tags/2.1.0.CR4/src/test/resources/META-INF/local-service.xml (rev 0)
+++ core/tags/2.1.0.CR4/src/test/resources/META-INF/local-service.xml 2008-02-21 03:48:11 UTC (rev 5367)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Sample TreeCache Service Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- Defines TreeCache configuration -->
+ <!-- ==================================================================== -->
+
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="jboss.cache:service=TreeCache">
+
+ <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=TransactionManager</depends>
+
+
+ <!-- Configure the TransactionManager -->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup
+ </attribute>
+
+
+ <!--
+ Node locking level : SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ -->
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+ <!--
+ Valid modes are LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+ -->
+ <attribute name="CacheMode">LOCAL</attribute>
+
+ <!-- Max number of milliseconds to wait for a lock acquisition -->
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+ </mbean>
+</server>
Added: core/tags/2.1.0.CR4/src/test/resources/cache-jdbc.properties
===================================================================
--- core/tags/2.1.0.CR4/src/test/resources/cache-jdbc.properties (rev 0)
+++ core/tags/2.1.0.CR4/src/test/resources/cache-jdbc.properties 2008-02-21 03:48:11 UTC (rev 5367)
@@ -0,0 +1,69 @@
+##
+# Standard JBC table properties
+# The table name can also be prepended with schema name for the given table.
+# Even though there is an Sql92 standard syntax for this: <schema_name>.<table name>
+#schema has different meanings accross various DBMS: Oracle - user name; PointBase - database name
+# Microsoft SQL Server & DB2 - schema name corresponds to the catalog owner
+cache.jdbc.table.name=jbosscache
+cache.jdbc.table.create=true
+cache.jdbc.table.drop=false
+cache.jdbc.table.primarykey=jbosscache_pk
+cache.jdbc.fqn.column=fqn
+cache.jdbc.fqn.type=varchar(255)
+cache.jdbc.node.column=node
+cache.jdbc.node.type=blob
+cache.jdbc.parent.column=parent
+# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
+# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which
+#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
+cache.jdbc.sql-concat=1 || 2
+
+# JBoss Cache Table properties for Hypersonic, just overrides
+#cache.jdbc.node.type=OBJECT
+
+##
+# DataSource
+#cache.jdbc.datasource=DefaultDS
+
+##
+# JDBC driver specific properties
+
+# Hypersonic
+#cache.jdbc.node.type=OBJECT
+
+## MySql
+#cache.jdbc.driver=com.mysql.jdbc.Driver
+#cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
+#cache.jdbc.user=root
+#cache.jdbc.password=admin
+
+## Oracle
+#cache.jdbc.driver=oracle.jdbc.OracleDriver
+#cache.jdbc.url=jdbc:oracle:thin:@192.168.0.100:1521:JBOSSDB
+#cache.jdbc.user=jboss
+#cache.jdbc.password=sa
+
+## MS Sql Server
+#cache.jdbc.driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+#cache.jdbc.url=jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=jbossdb;SelectMethod=cursor
+#cache.jdbc.user=sa
+#cache.jdbc.password=
+#cache.jdbc.node.type=image
+
+## Pointbase
+#cache.jdbc.driver=com.pointbase.jdbc.jdbcUniversalDriver
+#cache.jdbc.url=jdbc:pointbase:server://localhost:9092/jboss,new
+#cache.jdbc.user=PBPUBLIC
+#cache.jdbc.password=PBPUBLIC
+
+## PostgreSQL
+#cache.jdbc.driver = org.postgresql.Driver
+#cache.jdbc.url=jdbc:postgresql://192.168.0.100:5432/jbossdb
+#cache.jdbc.user=postgres
+#cache.jdbc.password=admin
+
+## Derby
+cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
+cache.jdbc.url=jdbc:derby:jbossdb;create=true
+cache.jdbc.user=user1
+cache.jdbc.password=user1
\ No newline at end of file
Property changes on: core/tags/2.1.0.CR4/src/test/resources/cache-jdbc.properties
___________________________________________________________________
Name: svn:executable
+ *
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5366 - in support/tags/1.2: xslt and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 20:55:39 -0500 (Wed, 20 Feb 2008)
New Revision: 5366
Modified:
support/tags/1.2/common/pom.xml
support/tags/1.2/xslt/pom.xml
Log:
Update version
Modified: support/tags/1.2/common/pom.xml
===================================================================
--- support/tags/1.2/common/pom.xml 2008-02-20 21:42:21 UTC (rev 5365)
+++ support/tags/1.2/common/pom.xml 2008-02-21 01:55:39 UTC (rev 5366)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-support</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-common-parent</artifactId>
Modified: support/tags/1.2/xslt/pom.xml
===================================================================
--- support/tags/1.2/xslt/pom.xml 2008-02-20 21:42:21 UTC (rev 5365)
+++ support/tags/1.2/xslt/pom.xml 2008-02-21 01:55:39 UTC (rev 5366)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-support</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.jboss.cache</groupId>
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5365 - in support/tags: 1.2 and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 16:42:21 -0500 (Wed, 20 Feb 2008)
New Revision: 5365
Added:
support/tags/1.2/
support/tags/1.2/common/pom.xml
Removed:
support/tags/1.2/common/pom.xml
Modified:
support/tags/1.2/pom.xml
Log:
Create 1.2
Copied: support/tags/1.2 (from rev 5363, support/trunk)
Deleted: support/tags/1.2/common/pom.xml
===================================================================
--- support/trunk/common/pom.xml 2008-02-20 18:23:14 UTC (rev 5363)
+++ support/tags/1.2/common/pom.xml 2008-02-20 21:42:21 UTC (rev 5365)
@@ -1,386 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-support</artifactId>
- <version>1.1-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-common-parent</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Cache Common Parent</name>
- <description>The parent POM for all JBoss Cache modules.</description>
- <url>http://labs.jboss.org/jbosscache</url>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://labs.jboss.org</url>
- </organization>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/copyleft/lesser.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbosscache/core/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbosscache/core/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.jboss.com/jira/browse/JBCACHE</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- <url>http://cruisecontrol.jboss.com/cc/</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <address>jbosscache-dev(a)lists.jboss.org</address>
- </notifier>
- </notifiers>
- </ciManagement>
- <mailingLists>
- <mailingList>
- <name>JBoss Cache Announcements</name>
- <post>jbosscache-announce(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-announce</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-announce</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/jbosscache-dev/</archive>
- </mailingList>
- <mailingList>
- <name>JBoss Cache Commit Notificatons</name>
- <post>jbosscache-commits(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-commits</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-commits</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/jbosscache-commits/</archive>
- </mailingList>
- <mailingList>
- <name>JBoss Cache Developers</name>
- <post>jbosscache-dev(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-dev</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-dev</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/jbosscache-dev/</archive>
- </mailingList>
- <mailingList>
- <name>JBoss Cache Issue Notifications</name>
- <post>jbosscache-issues(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-issues</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-issues</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/jbosscache-issues/</archive>
- </mailingList>
- </mailingLists>
- <build>
- <plugins>
-<!-- require at least JDK 1.5 to run the build -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.5,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-<!-- by default, compile to JDK 1.5 compatibility (individual modules and/or user can override) -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-<!-- add specification/implementation details to the manifests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.xml</exclude>
- <exclude>**/*.properties</exclude>
- </excludes>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <mainClass>org.jboss.cache.Version</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>bind.address</name>
- <value>127.0.0.1</value>
- </property>
- <property>
- <name>jgroups.stack</name>
- <value>udp</value>
- </property>
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
- </systemProperties>
- <groups>functional</groups>
- <forkMode>always</forkMode>
-<!-- increasing JVM heap size -->
- <argLine>-Xmx1024M</argLine>
-<!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) -->
-<!-- This seems to fail in some cases on 2.3 as well, disable for now -->
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- </configuration>
- </plugin>
-<!-- javadocs : we want these run in the 'package' lifecycle phase-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <aggregate>${jbosscache.reports.aggregate}</aggregate>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
- </links>
- </configuration>
- </execution>
- </executions>
- </plugin>
-<!-- Eclipse -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
- </configuration>
- </plugin>
- </plugins>
- <finalName>${artifactId}</finalName>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-<!-- DISABLE - Maven doesn't build the classpath correctly
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>${jbosscache.reports.aggregate}</aggregate>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- -->
-<!-- JXR - links from javadocs and junit reports to an html representation of the code -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>${jbosscache.reports.aggregate}</aggregate>
- </configuration>
- </plugin>
-<!-- PMD code analysis reports -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <aggregate>${jbosscache.reports.aggregate}</aggregate>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <configuration>
- <aggregate>${jbosscache.reports.aggregate}</aggregate>
- <tags>
- <tag>@FIXME</tag>
- <tag>@fixme</tag>
- <tag>FIXME</tag>
- <tag>fixme</tag>
- <tag>@TODO</tag>
- <tag>@todo</tag>
- <tag>TODO</tag>
- <tag>todo</tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- </plugin>
-<!-- Findbugs report -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <onlyAnalyze>org.jboss.cache.*</onlyAnalyze>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <properties>
-<!-- for now, at least, lets aggregate them -->
- <jbosscache.reports.aggregate>true</jbosscache.reports.aggregate>
- </properties>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <url>http://snapshots.jboss.org/maven2</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>Main Maven Repo</id>
- <url>http://repo1.maven.org/maven2/</url>
- </pluginRepository>
-<!-- Avoid enabling this, it brings in unstable plugins
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </pluginRepository>
--->
- <pluginRepository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <url>http://snapshots.jboss.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
- <dependencies>
-<!-- test dependencies to run the test suites -->
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.1</version>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-<!-- Profiles, used for test permutations -->
- <profiles>
- <profile>
- <id>jgroups-tcp</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>bind.address</name>
- <value>127.0.0.1</value>
- </property>
- <property>
- <name>jgroups.stack</name>
- <value>tcp</value>
- </property>
- </systemProperties>
- <groups>jgroups</groups>
- <reportsDirectory>${project.build.directory}/jgroups-tcp-reports</reportsDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <reportsDirectory>${project.build.directory}/jgroups-tcp-reports</reportsDirectory>
- <outputName>jgroups-tcp-report</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>transaction-jbossjta</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>bind.address</name>
- <value>127.0.0.1</value>
- </property>
- <property>
- <name>jgroups.stack</name>
- <value>udp</value>
- </property>
- <property>
- <name>org.jboss.cache.test.tm</name>
- <value>jboss-jta</value>
- </property>
- </systemProperties>
- <groups>transaction</groups>
- <reportsDirectory>${project.build.directory}/transaction-jbossjta-reports</reportsDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/transaction-jbossjta-reports</reportsDirectory>
- <outputName>transaction-jbossjta-report</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
Copied: support/tags/1.2/common/pom.xml (from rev 5364, support/trunk/common/pom.xml)
===================================================================
--- support/tags/1.2/common/pom.xml (rev 0)
+++ support/tags/1.2/common/pom.xml 2008-02-20 21:42:21 UTC (rev 5365)
@@ -0,0 +1,384 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-support</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-common-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Cache Common Parent</name>
+ <description>The parent POM for all JBoss Cache modules.</description>
+ <url>http://labs.jboss.org/jbosscache</url>
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://labs.jboss.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/copyleft/lesser.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbosscache/core/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbosscache/core/trunk</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.jboss.com/jira/browse/JBCACHE</url>
+ </issueManagement>
+ <ciManagement>
+ <system>cruisecontrol</system>
+ <url>http://cruisecontrol.jboss.com/cc/</url>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <address>jbosscache-dev(a)lists.jboss.org</address>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>JBoss Cache Announcements</name>
+ <post>jbosscache-announce(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-announce</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-announce</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/jbosscache-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>JBoss Cache Commit Notificatons</name>
+ <post>jbosscache-commits(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-commits</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-commits</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/jbosscache-commits/</archive>
+ </mailingList>
+ <mailingList>
+ <name>JBoss Cache Developers</name>
+ <post>jbosscache-dev(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-dev</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-dev</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/jbosscache-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>JBoss Cache Issue Notifications</name>
+ <post>jbosscache-issues(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-issues</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-issues</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/jbosscache-issues/</archive>
+ </mailingList>
+ </mailingLists>
+ <build>
+ <plugins>
+<!-- require at least JDK 1.5 to run the build -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.5,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+<!-- by default, compile to JDK 1.5 compatibility (individual modules and/or user can override) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+<!-- add specification/implementation details to the manifests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>bind.address</name>
+ <value>127.0.0.1</value>
+ </property>
+ <property>
+ <name>jgroups.stack</name>
+ <value>udp</value>
+ </property>
+ <property>
+ <name>java.net.preferIPv4Stack</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ <groups>functional</groups>
+ <forkMode>always</forkMode>
+<!-- increasing JVM heap size -->
+ <argLine>-Xmx1024M</argLine>
+<!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) -->
+<!-- This seems to fail in some cases on 2.3 as well, disable for now -->
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+<!-- javadocs : we want these run in the 'package' lifecycle phase-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <aggregate>${jbosscache.reports.aggregate}</aggregate>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+<!-- Eclipse -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>${artifactId}</finalName>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+<!-- DISABLE - Maven doesn't build the classpath correctly
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>${jbosscache.reports.aggregate}</aggregate>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ -->
+<!-- JXR - links from javadocs and junit reports to an html representation of the code -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>${jbosscache.reports.aggregate}</aggregate>
+ </configuration>
+ </plugin>
+<!-- PMD code analysis reports -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <aggregate>${jbosscache.reports.aggregate}</aggregate>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <aggregate>${jbosscache.reports.aggregate}</aggregate>
+ <tags>
+ <tag>@FIXME</tag>
+ <tag>@fixme</tag>
+ <tag>FIXME</tag>
+ <tag>fixme</tag>
+ <tag>@TODO</tag>
+ <tag>@todo</tag>
+ <tag>TODO</tag>
+ <tag>todo</tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ </plugin>
+<!-- Findbugs report -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <onlyAnalyze>org.jboss.cache.*</onlyAnalyze>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <properties>
+<!-- for now, at least, lets aggregate them -->
+ <jbosscache.reports.aggregate>true</jbosscache.reports.aggregate>
+ </properties>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Main Maven Repo</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ </pluginRepository>
+<!-- Avoid enabling this, it brings in unstable plugins
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </pluginRepository>
+-->
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>snapshots.jboss.org</id>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+<!-- test dependencies to run the test suites -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.1</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+<!-- Profiles, used for test permutations -->
+ <profiles>
+ <profile>
+ <id>jgroups-tcp</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>bind.address</name>
+ <value>127.0.0.1</value>
+ </property>
+ <property>
+ <name>jgroups.stack</name>
+ <value>tcp</value>
+ </property>
+ </systemProperties>
+ <groups>jgroups</groups>
+ <reportsDirectory>${project.build.directory}/jgroups-tcp-reports</reportsDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/jgroups-tcp-reports</reportsDirectory>
+ <outputName>jgroups-tcp-report</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>transaction-jbossjta</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>bind.address</name>
+ <value>127.0.0.1</value>
+ </property>
+ <property>
+ <name>jgroups.stack</name>
+ <value>udp</value>
+ </property>
+ <property>
+ <name>org.jboss.cache.test.tm</name>
+ <value>jboss-jta</value>
+ </property>
+ </systemProperties>
+ <groups>transaction</groups>
+ <reportsDirectory>${project.build.directory}/transaction-jbossjta-reports</reportsDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/transaction-jbossjta-reports</reportsDirectory>
+ <outputName>transaction-jbossjta-report</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified: support/tags/1.2/pom.xml
===================================================================
--- support/trunk/pom.xml 2008-02-20 18:23:14 UTC (rev 5363)
+++ support/tags/1.2/pom.xml 2008-02-20 21:42:21 UTC (rev 5365)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-support</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2</version>
<packaging>pom</packaging>
<name>JBoss Cache Support Modules</name>
<description>Grouping of JBoss Cache support modules</description>
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5364 - support/trunk/common.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 16:40:25 -0500 (Wed, 20 Feb 2008)
New Revision: 5364
Modified:
support/trunk/common/pom.xml
Log:
Remove exclusions
Modified: support/trunk/common/pom.xml
===================================================================
--- support/trunk/common/pom.xml 2008-02-20 18:23:14 UTC (rev 5363)
+++ support/trunk/common/pom.xml 2008-02-20 21:40:25 UTC (rev 5364)
@@ -111,14 +111,12 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
- <exclude>**/*.xml</exclude>
<exclude>**/*.properties</exclude>
</excludes>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <mainClass>org.jboss.cache.Version</mainClass>
</manifest>
</archive>
</configuration>
16 years, 10 months
- 1
- 0
JBoss Cache SVN: r5363 - pojo/branches/2.1.
by jbosscache-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2008-02-20 13:23:14 -0500 (Wed, 20 Feb 2008)
New Revision: 5363
Modified:
pojo/branches/2.1/pom.xml
Log:
Fix deps
Modified: pojo/branches/2.1/pom.xml
===================================================================
--- pojo/branches/2.1/pom.xml 2008-02-20 16:57:50 UTC (rev 5362)
+++ pojo/branches/2.1/pom.xml 2008-02-20 18:23:14 UTC (rev 5363)
@@ -37,13 +37,17 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- Hack AOP has broken deps -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>2.0.0.Beta4</version>
- <scope>runtime</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
</dependency>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<plugins>
16 years, 10 months
- 1
- 0