11:09 p.m.
Author: shawkins
Date: 2009-07-31 00:09:29 -0400 (Fri, 31 Jul 2009)
New Revision: 1206
Modified:
trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
trunk/runtime/src/test/resources/jboss-cache-configuration.xml
Log:
TEIID-485 updating the integration version of the cache config and calling stop prior to
destroy
Modified:
trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java
===================================================================
---
trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2009-07-30
16:53:28 UTC (rev 1205)
+++
trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2009-07-31
04:09:29 UTC (rev 1206)
@@ -111,6 +111,7 @@
public void destroy() {
jmxManager.unregisterAllMBeans();
+ this.cacheStore.stop();
this.cacheStore.destroy();
this.destroyed = true;
}
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2009-07-30
16:53:28 UTC (rev 1205)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2009-07-31
04:09:29 UTC (rev 1206)
@@ -161,6 +161,7 @@
*/
@Override
public void stop() throws ApplicationLifecycleException {
+ LogManager.logDetail(LogConstants.CTX_DQP, "Stopping the DQP");
//$NON-NLS-1$
processWorkerPool.shutdownNow();
try {
processWorkerPool.awaitTermination(10, TimeUnit.SECONDS);
Modified: trunk/runtime/src/test/resources/jboss-cache-configuration.xml
===================================================================
--- trunk/runtime/src/test/resources/jboss-cache-configuration.xml 2009-07-30 16:53:28 UTC
(rev 1205)
+++ trunk/runtime/src/test/resources/jboss-cache-configuration.xml 2009-07-31 04:09:29 UTC
(rev 1206)
@@ -1,72 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.cache.pojo.jmx.CacheJmxWrapper"
name="jboss.cache:service=TeiidCache">
- <attribute
name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute>
- <attribute name="IsolationLevel">READ_COMMITTED</attribute>
- <attribute
name="LockParentForChildInsertRemove">true</attribute>
-
- <attribute name="CacheMode">LOCAL</attribute>
- <attribute name="UseLazyDeserialization">true</attribute>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
- <!--
- The max amount of time (in milliseconds) we wait until the
- initial 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>
-
- <!-- Shutdown hook behavior. Valid choices are: DEFAULT, REGISTER and
DONT_REGISTER. this element is omitted, DEFAULT is used. -->
- <attribute name="ShutdownHookBehavior">DEFAULT</attribute>
+ <locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="15000" lockParentForChildInsertRemove="true"
/>
+ <transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
/>
+
+ <shutdown hookBehavior="DEFAULT" />
+
+ <loaders passivation="false" shared="false">
+ <loader class="org.jboss.cache.loader.FileCacheLoader"
fetchPersistentState="true" purgeOnStartup="true">
+ <properties>location=./target/scratch/teiid</properties>
+ </loader>
+ </loaders>
+
+ <eviction wakeUpInterval="3000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
eventQueueSize="100000">
+ <property name="maxNodes" value="10000" />
+ <!-- 0 = immediate eviction, -1 = no limit -->
+ <property name="timeToLive" value="-1" />
+ </default>
+ </eviction>
- <attribute name="FetchInMemoryState">true</attribute>
-
- <attribute name="CacheLoaderConfig" replace="false">
- <config>
-
- <!-- are the cache loaders shared in a cluster? -->
- <shared>false</shared>
- <!-- if passivation is true, only the first cache loader is used; the rest
are ignored -->
- <passivation>true</passivation>
-
- <cacheloader>
- <class>org.jboss.cache.loader.FileCacheLoader</class>
- <properties>location=./target/scratch/teiid</properties>
-
- <!--fetch the persistent state of a cache when joining a
cluster-->
- <fetchPersistentState>true</fetchPersistentState>
-
- <!-- empties the specified cache loader when cache loader starts up
-->
- <purgeOnStartup>true</purgeOnStartup>
-
- <!-- cache loader is shared among different cache instances -->
- <shared>false</shared>
- </cacheloader>
- </config>
- </attribute>
-
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">3</attribute>
- <!-- This defaults to 200000 if not specified -->
- <attribute name="eventQueueSize">100000</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">10000</attribute>
- <attribute name="timeToLiveSeconds">0</attribute>
- </region>
- </config>
- </attribute>
-
- </mbean>
-</server>
\ No newline at end of file
+ <serialization useLazyDeserialization="true"/>
+
+</jbosscache>
+
\ No newline at end of file