[jbosscache-commits] JBoss Cache SVN: r6747 - in pojo/trunk: src/main/java/org/jboss/cache/pojo and 21 other directories.

Author: jason.greene(a)jboss.com Date: 2008-09-17 19:24:20 -0400 (Wed, 17 Sep 2008) New Revision: 6747 Modified: pojo/trunk/pom.xml pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java pojo/trunk/src/main/java/org/jboss/cache/pojo/Reference.java pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedArray.java pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedMapImpl.java pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedObjectArray.java pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedPrimitiveArray.java pojo/trunk/src/main/java/org/jboss/cache/pojo/eviction/AopLRUPolicy.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AbstractHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ArrayHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CollectionClassHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalConstant.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ObjectGraphHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ReferenceImpl.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/SerializableObjectHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java pojo/trunk/src/main/java/org/jboss/cache/pojo/util/AopUtil.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/CircularGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/FindReferencesTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NewLocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NonAspectizedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ObjectGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/RecursiveRefTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/TxUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapNullTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedSetTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CollectionTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ObjectGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/demo/JBossCacheGUI.java pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/InterceptorRegistrationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapperTestBase.java pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListenerCountTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/SetTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/TxObjectTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/LocalTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/passivation/LocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/NewLocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/InMemoryTxUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListTxUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalExceptionUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalTxUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapTxUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/PojoCollectionRollbackTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetTxUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/util/ObjectUtilTest.java pojo/trunk/src/test/resources/META-INF/unit-test-cache-service.xml pojo/trunk/src/test/resources/log4j.xml Log: Numerous changes to make tests work against MVCC and 3.0 Modified: pojo/trunk/pom.xml =================================================================== --- pojo/trunk/pom.xml 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/pom.xml 2008-09-17 23:24:20 UTC (rev 6747) @@ -127,6 +127,7 @@ <!-- This seems to fail in some cases on 2.3 as well, disable for now --> <useSystemClassLoader>true</useSystemClassLoader> <redirectTestOutputToFile>false</redirectTestOutputToFile> + <trimStackTrace>false</trimStackTrace> </configuration> </plugin> <!-- the docbook generation plugin for the user guide --> Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -83,7 +83,7 @@ * @return Existing POJO or null if there is none. * @throws PojoCacheException Throws if there is an error related to the cache operation. */ - Object attach(Fqn id, Object pojo) throws PojoCacheException; + Object attach(Fqn<?> id, Object pojo) throws PojoCacheException; /** * Remove POJO object from the cache. @@ -102,7 +102,7 @@ * @return Original value object from this node. * @throws PojoCacheException Throws if there is an error related to the cache operation. */ - Object detach(Fqn id) throws PojoCacheException; + Object detach(Fqn<?> id) throws PojoCacheException; /** * Return the <code>Fqn</code> of the internal node containing the data of this attached object. @@ -116,7 +116,7 @@ * @return <code>Fqn</code> of the internal data node. <code>null</code> if the object is * immediate, serializable, or not in the cache. */ - Fqn getInternalFqn(Object object); + Fqn<?> getInternalFqn(Object object); /** * Return a list of the references from attached objects to this object. For each reference it @@ -147,7 +147,7 @@ * @param id the location in the cache to examine * @return true if an attached object exists, false if not */ - boolean exists(Fqn id); + boolean exists(Fqn<?> id); /** * Retrieve POJO from the cache system. Return null if object does not exist in the cache. @@ -168,7 +168,7 @@ * @return Current content value. Null if does not exist. * @throws PojoCacheException Throws if there is an error related to the cache operation. */ - Object find(Fqn id) throws PojoCacheException; + Object find(Fqn<?> id) throws PojoCacheException; /** * Query all managed POJO objects under the id recursively. Note that this will not return @@ -181,7 +181,7 @@ * @return Map of all POJOs found with (id, POJO) pair. Return size of 0, if not found. * @throws PojoCacheException Throws if there is an error related to the cache operation. */ - Map<Fqn, Object> findAll(String id) throws PojoCacheException; + Map<Fqn<?>, Object> findAll(String id) throws PojoCacheException; /** * Query all managed POJO objects under the id recursively. Note that this will not return @@ -195,7 +195,7 @@ * @return Map of all POJOs found with (id, POJO) pair. Return size of 0, if not found. * @throws PojoCacheException Throws if there is an error related to the cache operation. */ - Map<Fqn, Object> findAll(Fqn id) throws PojoCacheException; + Map<Fqn<?>, Object> findAll(Fqn<?> id) throws PojoCacheException; /** * Lifecycle method to start PojoCache. Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/Reference.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/Reference.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/Reference.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -37,7 +37,7 @@ * * @return <code>Fqn</code> of the referring node. */ - public Fqn getFqn(); + public Fqn<?> getFqn(); /** * Returns the name of the node key which references the attached object, or null Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedArray.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedArray.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedArray.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -37,18 +37,18 @@ { private static final String LENGTH = "ARRAY.LENGTH"; protected PojoCacheImpl cache; - protected Fqn fqn; + protected Fqn<?> fqn; private int length = -1; private Class<?> type; - public static CachedArray load(Fqn fqn, PojoCacheImpl cache, Class<?> type) + public static CachedArray load(Fqn<?> fqn, PojoCacheImpl cache, Class<?> type) { boolean primitive = CachedType.isImmediate(type.getComponentType()); CachedArray array = primitive ? new CachedPrimitiveArray(fqn, type, cache) : new CachedObjectArray(fqn, type, cache); return array; } - public static CachedArray create(Fqn fqn, PojoCacheImpl cache, Object originalArray) + public static CachedArray create(Fqn<?> fqn, PojoCacheImpl cache, Object originalArray) { Class<?> type = originalArray.getClass(); assert type.isArray(); @@ -67,14 +67,14 @@ return array; } - protected CachedArray(Fqn fqn, Class<?> type, PojoCacheImpl cache) + protected CachedArray(Fqn<?> fqn, Class<?> type, PojoCacheImpl cache) { this.fqn = fqn; this.type = type; this.cache = cache; } - public Fqn getFqn() + public Fqn<?> getFqn() { return fqn; } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedMapImpl.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedMapImpl.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedMapImpl.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -54,7 +54,7 @@ throw new PojoCacheException("Non-serializable for " + relative.getClass().getName()); } - return Fqn.fromRelativeElements(baseFqn, relative); + return new Fqn(baseFqn, relative); } private Fqn getFqn() Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedObjectArray.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedObjectArray.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedObjectArray.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -40,14 +40,14 @@ // so that multi-dimensional arrays can be handled properly private static ArrayInterceptable arraySource = new ArrayInterceptable() {}; - protected CachedObjectArray(Fqn fqn, Class<?> type, PojoCacheImpl cache) + protected CachedObjectArray(Fqn<?> fqn, Class<?> type, PojoCacheImpl cache) { super(fqn, type, cache); } public void set(int index, Object element) { - Fqn fqn = AopUtil.constructFqn(this.fqn, IntegerCache.toString(index)); + Fqn<?> fqn = AopUtil.constructFqn(this.fqn, IntegerCache.toString(index)); cache.attach(fqn, Null.toNullObject(element), null, arraySource); cache.getCache().put(fqn, InternalConstant.POJOCACHE_OPERATION, "SET"); @@ -55,7 +55,7 @@ public Object get(int index) { - Fqn fqn = AopUtil.constructFqn(this.fqn, IntegerCache.toString(index)); + Fqn<?> fqn = AopUtil.constructFqn(this.fqn, IntegerCache.toString(index)); return Null.toNullValue(cache.find(fqn, null, arraySource)); } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedPrimitiveArray.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedPrimitiveArray.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/collection/CachedPrimitiveArray.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -34,7 +34,7 @@ { private static final String ELEMENT = "ARRAY.PELEMENT."; - protected CachedPrimitiveArray(Fqn fqn, Class<?> type, PojoCacheImpl cache) + protected CachedPrimitiveArray(Fqn<?> fqn, Class<?> type, PojoCacheImpl cache) { super(fqn, type, cache); } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/eviction/AopLRUPolicy.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/eviction/AopLRUPolicy.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/eviction/AopLRUPolicy.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -15,7 +15,6 @@ import org.jboss.cache.Fqn; import org.jboss.cache.eviction.EvictionAlgorithm; import org.jboss.cache.eviction.LRUPolicy; -import org.jboss.cache.eviction.NodeEventType; /** @@ -45,8 +44,8 @@ * * @param fqn */ - public boolean canIgnoreEvent(Fqn fqn, NodeEventType eventType) - { - return false; - } +// public boolean canIgnoreEvent(Fqn fqn, NodeEventType eventType) +// { +// return false; +// } } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AbstractHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AbstractHandler.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AbstractHandler.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -34,11 +34,11 @@ protected abstract boolean handles(Class<?> clazz); - protected abstract Object remove(Fqn fqn, Reference reference, Object result); + protected abstract Object remove(Fqn<?> fqn, Reference reference, Object result); - protected abstract void put(Fqn fqn, Reference reference, Object obj); + protected abstract void put(Fqn<?> fqn, Reference reference, Object obj); - protected abstract Object get(Fqn fqn, Class<?> clazz, PojoInstance pojoInstance); + protected abstract Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance); - protected abstract Fqn getFqn(Object obj); + protected abstract Fqn<?> getFqn(Object obj); } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -64,7 +64,7 @@ } @Override - protected Fqn getFqn(Object obj) + protected Fqn<?> getFqn(Object obj) { if (obj instanceof Advised) { @@ -82,7 +82,7 @@ } @Override - protected Object get(Fqn fqn, Class<?> clazz, PojoInstance pojoInstance) throws CacheException + protected Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance) throws CacheException { CachedType type = pCache_.getCachedType(clazz); Object obj = Instantiator.newInstance(clazz); @@ -117,7 +117,7 @@ } @Override - protected void put(Fqn fqn, Reference reference, Object obj) throws CacheException + protected void put(Fqn<?> fqn, Reference reference, Object obj) throws CacheException { CachedType type = pCache_.getCachedType(obj.getClass()); // We have a clean slate then. @@ -202,7 +202,7 @@ } @Override - protected Object remove(Fqn fqn, Reference referencingFqn, Object result) throws CacheException + protected Object remove(Fqn<?> fqn, Reference referencingFqn, Object result) throws CacheException { CachedType type = pCache_.getCachedType(result.getClass()); InstanceAdvisor advisor = ((Advised) result)._getInstanceAdvisor(); Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ArrayHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ArrayHandler.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ArrayHandler.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -41,14 +41,14 @@ this.cache = cache; } - protected Fqn getFqn(Object array) + protected Fqn<?> getFqn(Object array) { CachedArray cached = CachedArrayRegistry.lookup(array); return cached != null ? cached.getFqn() : null; } @Override - protected void put(Fqn fqn, Reference reference, Object obj) + protected void put(Fqn<?> fqn, Reference reference, Object obj) { // Always initialize the ref count so that we can mark this as an AopNode. PojoInstance pojoInstance = InternalHelper.initializeAopInstance(reference); @@ -61,7 +61,7 @@ } @Override - protected Object get(Fqn fqn, Class<?> clazz, PojoInstance pojo) + protected Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojo) { CachedArray cached = CachedArray.load(fqn, cache, clazz); Object array = cached.toArray(); @@ -71,7 +71,7 @@ } @Override - protected Object remove(Fqn fqn, Reference referencingFqn, Object obj) + protected Object remove(Fqn<?> fqn, Reference referencingFqn, Object obj) { CachedArray cached = CachedArrayRegistry.lookup(obj); if (cached != null) { Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CollectionClassHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CollectionClassHandler.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CollectionClassHandler.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -42,7 +42,7 @@ internal_ = internal; } - protected Fqn getFqn(Object collection) + protected Fqn<?> getFqn(Object collection) { if (! (collection instanceof ClassProxy)) return null; @@ -266,7 +266,7 @@ } @Override - protected Object remove(Fqn fqn, Reference referencingFqn, Object obj) throws CacheException + protected Object remove(Fqn<?> fqn, Reference referencingFqn, Object obj) throws CacheException { if (!(obj instanceof ClassProxy)) { Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalConstant.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalConstant.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalConstant.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -21,9 +21,9 @@ public static final String SERIALIZED = "__SERIALIZED__"; public static final String JBOSS_INTERNAL_STRING = "__JBossInternal__"; public static final String JBOSS_INTERNAL_ID_SEP_STRING = "_ID_"; - public static final Fqn JBOSS_INTERNAL = Fqn.fromString(JBOSS_INTERNAL_STRING); - public static final Fqn JBOSS_INTERNAL_ID_SEP = Fqn.fromString(JBOSS_INTERNAL_ID_SEP_STRING); - public static final Fqn JBOSS_INTERNAL_MAP = Fqn.fromRelativeElements(InternalConstant.JBOSS_INTERNAL, "__RefMap__"); + public static final Fqn<String> JBOSS_INTERNAL = new Fqn<String>(JBOSS_INTERNAL_STRING); + public static final Fqn<String> JBOSS_INTERNAL_ID_SEP = new Fqn<String>(JBOSS_INTERNAL_ID_SEP_STRING); + public static final Fqn<String> JBOSS_INTERNAL_MAP = new Fqn<String>(InternalConstant.JBOSS_INTERNAL, "__RefMap__"); public static final String JBOSS_INTERNAL_STATIC = "__jboss:static__"; public static final String POJOCACHE_KEY_PREFIX = "POJOCache."; public static final String POJOCACHE_STATUS = POJOCACHE_KEY_PREFIX + "Status"; Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -279,7 +279,7 @@ throw new IllegalStateException("InternalDelegate.getInternalFqn(). fqn is either null or empty!"); String indirectFqn = getIndirectFqn(fqn); - return Fqn.fromRelativeElements(InternalConstant.JBOSS_INTERNAL_MAP, indirectFqn); + return new Fqn(InternalConstant.JBOSS_INTERNAL_MAP, indirectFqn); // return JBOSS_INTERNAL_MAP; } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ObjectGraphHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ObjectGraphHandler.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ObjectGraphHandler.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -33,7 +33,7 @@ internal_ = internal; } - protected Fqn getFqn(Object obj) + protected Fqn<?> getFqn(Object obj) { return null; } @@ -44,7 +44,7 @@ } @Override - protected Object get(Fqn fqn, Class<?> clazz, PojoInstance pojoInstance) throws CacheException + protected Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance) throws CacheException { // Note this is actually the aliasFqn, not the real fqn! Object obj; @@ -58,12 +58,12 @@ } @Override - protected void put(Fqn fqn, Reference reference, Object obj) throws CacheException + protected void put(Fqn<?> fqn, Reference reference, Object obj) throws CacheException { setupRefCounting(fqn, reference); } - boolean isMultipleReferenced(Fqn internalFqn) + boolean isMultipleReferenced(Fqn<?> internalFqn) { // Note this is actually the aliasFqn, not the real fqn! PojoInstance pojoInstance = null; @@ -81,7 +81,7 @@ } @Override - protected Object remove(Fqn fqn, Reference reference, Object pojo) + protected Object remove(Fqn<?> fqn, Reference reference, Object pojo) throws CacheException { if (log.isDebugEnabled()) @@ -97,7 +97,7 @@ /** * Remove the object from the the reference fqn, meaning just decrement the ref counter. */ - private void removeFromReference(Fqn originalFqn, Reference reference) throws CacheException + private void removeFromReference(Fqn<?> originalFqn, Reference reference) throws CacheException { if (decrementRefCount(originalFqn, reference) == PojoInstance.INITIAL_COUNTER_VALUE) { @@ -114,18 +114,18 @@ * @param fqn The original fqn node * @param refFqn The new internal fqn node */ - private void setupRefCounting(Fqn fqn, Reference reference) throws CacheException + private void setupRefCounting(Fqn<?> fqn, Reference reference) throws CacheException { // increment the reference counting incrementRefCount(fqn, reference); } - private int incrementRefCount(Fqn originalFqn, Reference reference) throws CacheException + private int incrementRefCount(Fqn<?> originalFqn, Reference reference) throws CacheException { return internal_.incrementRefCount(originalFqn, reference); } - private int decrementRefCount(Fqn originalFqn, Reference reference) throws CacheException + private int decrementRefCount(Fqn<?> originalFqn, Reference reference) throws CacheException { return internal_.decrementRefCount(originalFqn, reference); } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -120,7 +120,7 @@ return oldValue;// we are done AbstractHandler handler = getHandler(obj.getClass(), allowArray); - Fqn internalFqn = handler.getFqn(obj); + Fqn<?> internalFqn = handler.getFqn(obj); Reference reference = new ReferenceImpl(fqn, field); if (internalFqn != null) @@ -232,7 +232,7 @@ return null; } - Fqn internalFqn = pojoReference.getFqn(); + Fqn<?> internalFqn = pojoReference.getFqn(); @@ -285,9 +285,9 @@ return map; } - private Object getObjectInternal(Fqn fqn, String field, Object source) throws CacheException + private Object getObjectInternal(Fqn<?> fqn, String field, Object source) throws CacheException { - Fqn internalFqn = fqn; + Fqn<?> internalFqn = fqn; PojoReference pojoReference = internal_.getPojoReference(fqn, field); if (pojoReference != null) { @@ -347,21 +347,21 @@ } } - public boolean exists(Fqn id) + public boolean exists(Fqn<?> id) { return internal_.getPojoReference(id, null) != null || internal_.getPojoInstance(id) != null; } - public Fqn getInternalFqn(Object object) + public Fqn<?> getInternalFqn(Object object) { AbstractHandler handler = getHandler(object.getClass(), true); - Fqn internalFqn = handler.getFqn(object); + Fqn<?> internalFqn = handler.getFqn(object); return internalFqn; } public Collection<Reference> getReferences(Object object) { - Fqn fqn = getInternalFqn(object); + Fqn<?> fqn = getInternalFqn(object); if (fqn == null) return Collections.emptyList(); Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -8,6 +8,7 @@ package org.jboss.cache.pojo.impl; import java.util.Collection; +import java.util.List; import java.util.Map; import java.util.WeakHashMap; import java.util.regex.Pattern; @@ -25,9 +26,6 @@ import org.jboss.cache.Fqn; import org.jboss.cache.Version; import org.jboss.cache.config.Configuration; -import org.jboss.cache.config.OldFileFormatException; -import org.jboss.cache.config.parsing.XmlConfigurationParser; -import org.jboss.cache.config.parsing.XmlConfigurationParser2x; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheException; import org.jboss.cache.pojo.PojoCacheThreadContext; @@ -57,20 +55,9 @@ { try { - // cache_ = new PojoTreeCache(); - // cache_.setConfiguration(new XmlConfigurationParser().parseFile(configStr)); - - XmlConfigurationParser parser = new XmlConfigurationParser(); - Configuration expected = parser.parseFile(configStr); - - init(expected, toStart); + cache = (CacheSPI<Object, Object>)DefaultCacheFactory.getInstance().createCache(configStr, toStart); + delegate_ = new PojoCacheDelegate(this); } - catch (OldFileFormatException e) - { - log_.warn("Detected legacy configuration file format when parsing [" + configStr + "]. Migrating to the new (3.x) file format is recommended. See FAQs for details."); - XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x(); - init(oldParser.parseFile(configStr), toStart); - } catch (Exception e) { throw new PojoCacheException("Failed to start " + configStr, e); @@ -79,14 +66,9 @@ public PojoCacheImpl(Configuration config, boolean toStart) { - init(config, toStart); - } - - private void init(Configuration config, boolean toStart) - { try { - cache = (CacheSPI<Object, Object>) (new DefaultCacheFactory()).createCache(config, toStart); + cache = (CacheSPI<Object, Object>) DefaultCacheFactory.getInstance().createCache(config, toStart); } catch (Exception e) { @@ -106,12 +88,12 @@ return attach(Fqn.fromString(id), pojo); } - public Object attach(Fqn id, Object pojo) throws PojoCacheException + public Object attach(Fqn<?> id, Object pojo) throws PojoCacheException { return attach(id, pojo, null, null); } - public Object attach(Fqn id, Object pojo, String field, Object source) throws PojoCacheException + public Object attach(Fqn<?> id, Object pojo, String field, Object source) throws PojoCacheException { TransactionManager tm = getTransactionManager(); boolean createdTransaction = setupTransaction(tm); @@ -123,6 +105,9 @@ catch (Throwable t) { setRollbackOnly(tm); + if (t instanceof PojoCacheException) + throw (PojoCacheException)t; + throw new PojoCacheException("attach failed " + id, t); } finally @@ -132,7 +117,7 @@ } } - public Object detach(Fqn id, String field, Object source) throws PojoCacheException + public Object detach(Fqn<?> id, String field, Object source) throws PojoCacheException { TransactionManager tm = getTransactionManager(); boolean createdTransaction = setupTransaction(tm); @@ -144,6 +129,8 @@ catch (Throwable t) { setRollbackOnly(tm); + if (t instanceof PojoCacheException) + throw (PojoCacheException)t; throw new PojoCacheException("detach failed " + id, t); } finally @@ -153,7 +140,7 @@ } } - private void endTransaction(TransactionManager tm, Fqn id) + private void endTransaction(TransactionManager tm, Fqn<?> id) { try { @@ -229,12 +216,12 @@ - public Object detach(Fqn id) throws PojoCacheException + public Object detach(Fqn<?> id) throws PojoCacheException { return detach(id, null, null); } - public Fqn getInternalFqn(Object object) + public Fqn<?> getInternalFqn(Object object) { return delegate_.getInternalFqn(object); } @@ -244,7 +231,7 @@ return delegate_.getReferences(object); } - public boolean exists(Fqn id) + public boolean exists(Fqn<?> id) { return delegate_.exists(id); } @@ -254,7 +241,7 @@ return find(Fqn.fromString(id)); } - public Object find(Fqn id) throws PojoCacheException + public Object find(Fqn<?> id) throws PojoCacheException { try { @@ -266,18 +253,18 @@ } } - public Object find(Fqn id, String field, Object source) throws CacheException + public Object find(Fqn<?> id, String field, Object source) throws CacheException { return delegate_.getObject(id, field, source); } - public Map<Fqn, Object> findAll(String id) throws PojoCacheException + public Map<Fqn<?>, Object> findAll(String id) throws PojoCacheException { return findAll(Fqn.fromString(id)); } - public Map<Fqn, Object> findAll(Fqn id) throws PojoCacheException + public Map<Fqn<?>, Object> findAll(Fqn<?> id) throws PojoCacheException { // Should produce "/" if (id == null) id = Fqn.ROOT; Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ReferenceImpl.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ReferenceImpl.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/ReferenceImpl.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -40,10 +40,10 @@ { private static final long serialVersionUID = 2647262858847953704L; - private Fqn fqn; + private Fqn<?> fqn; private String key; - public ReferenceImpl(Fqn fqn) + public ReferenceImpl(Fqn<?> fqn) { this(fqn, null); } @@ -52,7 +52,7 @@ * @param fqn <code>Fqn</code> of the referring node. Cannot be <code>null</code>. * @param key Name of the field, index in the field or key in the collection that is containing the reference. */ - public ReferenceImpl(Fqn fqn, String key) + public ReferenceImpl(Fqn<?> fqn, String key) { if (fqn == null) throw new IllegalArgumentException("Fqn can not be null!!"); @@ -66,7 +66,7 @@ return key; } - public Fqn getFqn() + public Fqn<?> getFqn() { return fqn; } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/SerializableObjectHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/SerializableObjectHandler.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/SerializableObjectHandler.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -38,7 +38,7 @@ internal_ = internal; } - protected Fqn getFqn(Object obj) + protected Fqn<?> getFqn(Object obj) { // Not supported return null; @@ -59,7 +59,7 @@ @Override - protected void put(Fqn fqn, Reference reference, Object obj) throws CacheException + protected void put(Fqn<?> fqn, Reference reference, Object obj) throws CacheException { // Note that JBoss Serialization can serialize any type now. if (log_.isDebugEnabled()) @@ -87,7 +87,7 @@ } @Override - protected Object remove(Fqn fqn, Reference reference, Object result) throws CacheException + protected Object remove(Fqn<?> fqn, Reference reference, Object result) throws CacheException { cache.removeNode(fqn); return result; Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -12,7 +12,7 @@ import org.jboss.aop.advice.Interceptor; import org.jboss.aop.joinpoint.MethodInvocation; import org.jboss.cache.CacheSPI; -import org.jboss.cache.invocation.InvocationContext; +import org.jboss.cache.InvocationContext; import org.jboss.cache.pojo.impl.PojoCacheImpl; /** Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -859,7 +859,7 @@ private CacheJmxWrapper buildPlainCacheWrapper(PojoCache pojoCache) { CacheJmxWrapper plainCache = new CacheJmxWrapper(); - plainCache.setRegisterInterceptors(getRegisterInterceptors()); + //plainCache.setRegisterInterceptors(getRegisterInterceptors()); plainCache.setCache(pojoCache.getCache()); // It shouldn't send out lifecycle state change notifications for itself; // we do it Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/util/AopUtil.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/util/AopUtil.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/util/AopUtil.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -134,7 +134,7 @@ // TODO Don't know why. But this will fail the CachedSetAopTest clear() method since look up is always // Null at the last index. But why? // TODO also see JBCACHE-282 - return Fqn.fromRelativeElements(baseFqn, relative.toString()); + return new Fqn(baseFqn, relative.toString()); // String tmp = baseFqn.toString() +"/" + relative.toString(); // return Fqn.fromString(tmp); @@ -154,7 +154,7 @@ Fqn trueId = null; if (fqn.hasElement(InternalConstant.JBOSS_INTERNAL_ID_SEP_STRING)) { - List<Object> list = new ArrayList<Object>(); + List list = new ArrayList(); for (int i = 0; i < fqn.size(); i++) { if (fqn.get(i).equals(InternalConstant.JBOSS_INTERNAL_STRING)) @@ -168,7 +168,7 @@ } list.add(fqn.get(i)); } - trueId = Fqn.fromList(list); + trueId = new Fqn(list); } else { @@ -183,9 +183,9 @@ if (region == null || region.getFqn().equals(Fqn.ROOT)) { // Move id under JBInternal to promote concurrency - Fqn f0 = Fqn.fromRelativeFqn(InternalConstant.JBOSS_INTERNAL, trueId); - Fqn f = Fqn.fromRelativeFqn(f0, InternalConstant.JBOSS_INTERNAL_ID_SEP); - return Fqn.fromRelativeElements(f, guid.toString()); + Fqn f0 = new Fqn(InternalConstant.JBOSS_INTERNAL, trueId); + Fqn f = new Fqn(f0, InternalConstant.JBOSS_INTERNAL_ID_SEP); + return new Fqn(f, Fqn.fromString(guid.toString())); } else { @@ -193,10 +193,10 @@ Fqn rf = region.getFqn(); // Extract rest of fqn id Fqn childf = trueId.getSubFqn(rf.size(), trueId.size()); - Fqn f0 = Fqn.fromRelativeFqn(InternalConstant.JBOSS_INTERNAL, childf); - Fqn f = Fqn.fromRelativeFqn(f0, InternalConstant.JBOSS_INTERNAL_ID_SEP); - Fqn f1 = Fqn.fromRelativeFqn(rf, f); - return Fqn.fromRelativeElements(f1, guid.toString()); + Fqn f0 = new Fqn(InternalConstant.JBOSS_INTERNAL, childf); + Fqn f = new Fqn(f0, InternalConstant.JBOSS_INTERNAL_ID_SEP); + Fqn f1 = new Fqn(rf, f); + return new Fqn(f1, Fqn.fromString(guid.toString())); } } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -56,7 +56,7 @@ cache1.start(); cache2 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); - cache2.getCache().addCacheListener(new MyCacheListener(false)); + //cache2.getCache().addCacheListener(new MyCacheListener(false)); cache2.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -34,6 +34,7 @@ import org.jboss.cache.config.BuddyReplicationConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; +import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; import org.jboss.cache.pojo.test.Person; import org.testng.annotations.AfterMethod; @@ -47,7 +48,7 @@ * @version $Revision$ */ @Test(groups = {"functional"}) -public class BuddyReplicationTest +public class BuddyReplicationTest { Log log = LogFactory.getLog(ReplicatedTest.class); PojoCache cache, cache1; @@ -60,12 +61,17 @@ Configuration cfg1 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); addBuddyReplication(cfg1); cache = PojoCacheFactory.createCache(cfg1, toStart); - cache.start(); + Configuration cfg2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); addBuddyReplication(cfg2); cache1 = PojoCacheFactory.createCache(cfg2, toStart); + + cache.getCache().getConfiguration().setSyncCommitPhase(true); + cache1.getCache().getConfiguration().setSyncCommitPhase(true); + + cache.start(); cache1.start(); - + // Enable gravitation cache.getThreadContext().setGravitationEnabled(true); cache1.getThreadContext().setGravitationEnabled(true); @@ -88,6 +94,8 @@ brc.setBuddyLocatorConfig(blc); cfg.setBuddyReplicationConfig(brc); + //FIXME + cfg.setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); } private Person createPerson(String id, String name, int age) @@ -101,6 +109,7 @@ private Person getReplicatedPerson(String id) throws PojoCacheException { + log.info("getting replicant: " + id); Person repl = (Person) cache1.find(id); assertNotNull("Person found at " + id, repl); return repl; @@ -120,28 +129,23 @@ public void testDynamicRefSwapping() throws Exception { Person person = createPerson("/person/test3", "Joe", 32); - try - { - person.setAge(30); - List<String> med = person.getMedication(); - assertNull("Medication should be null ", med); - person.setAge(61); - med = person.getMedication(); - assertEquals("Medication ", (Object) "Lipitor", (Object) med.get(0)); - assertEquals("Medication on cache1 ", "Lipitor", - person.getMedication().get(0)); + person.setAge(30); + List<String> med = person.getMedication(); + assertNull("Medication should be null ", med); + person.setAge(61); + med = person.getMedication(); + assertEquals("Medication ", (Object) "Lipitor", (Object) med.get(0)); + assertEquals("Medication on cache1 ", "Lipitor", + person.getMedication().get(0)); - person.setAge(71); - assertEquals("Medication ", "Vioxx", med.get(1)); - Person repl = getReplicatedPerson("/person/test3"); - assertEquals("Medication on cache1 ", "Vioxx", - repl.getMedication().get(1)); - cache.detach("/person/test3"); - - } catch (Exception e) - { - // should be thrown - } + person.setAge(71); + assertEquals("Medication ", "Vioxx", med.get(1)); + Person repl = getReplicatedPerson("/person/test3"); + List<String> medication = repl.getMedication(); + log.info("Got medication!"); + assertEquals("Medication on cache1 ", "Vioxx", + medication.get(1)); + cache.detach("/person/test3"); } public void testTransient() throws Exception Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/CircularGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/CircularGraphTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/CircularGraphTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -40,7 +40,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -42,7 +42,7 @@ */ @Test(groups = {"functional"}) -public class EnumTest +public class EnumTest { Log log = LogFactory.getLog(EnumTest.class); PojoCache cache_, cache1_; @@ -50,12 +50,12 @@ @Replicable public static class EnumContainer { - private EnumPlanet planet = EnumPlanet.EARTH; + private EnumPlanet planet = EnumPlanet.EARTH; - public void setPlanet(EnumPlanet planet) - { - this.planet = planet; - } + public void setPlanet(EnumPlanet planet) + { + this.planet = planet; + } public EnumPlanet getPlanet() { @@ -77,9 +77,13 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - boolean toStart = true; + boolean toStart = false; cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_.getCache().getConfiguration().setSyncCommitPhase(true); + cache1_.getCache().getConfiguration().setSyncCommitPhase(true); + cache_.start(); + cache1_.start(); } @AfterMethod(alwaysRun = true) Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/FindReferencesTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/FindReferencesTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/FindReferencesTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -28,7 +28,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); @@ -82,7 +82,7 @@ log.info("testNoReferences() ...."); Person joe = createPerson("/person/joe", "Joe Black", 32, null); - Fqn joesInternalFqn = cache_.getInternalFqn(joe); + Fqn<?> joesInternalFqn = cache_.getInternalFqn(joe); assertTrue("Internal Fqn not null", joesInternalFqn != null); Collection<Reference> addressReferences = cache_.getReferences(joe); @@ -97,7 +97,7 @@ Address address = createAddress(); Person joe = createPerson("/person/joe", "Joe Black", 32, address); - Fqn joesInternalFqn = cache_.getInternalFqn(joe); + Fqn<?> joesInternalFqn = cache_.getInternalFqn(joe); Collection<Reference> addressReferences = cache_.getReferences(address); assertEquals("Size", 1, addressReferences.size()); @@ -112,8 +112,8 @@ Person joe = createPerson("/person/joe", "Joe Black", 32, address); Person jane = createPerson("/person/jane", "Jane Black", 32, address); - Fqn joesInternalFqn = cache_.getInternalFqn(joe); - Fqn janesInternalFqn = cache_.getInternalFqn(jane); + Fqn<?> joesInternalFqn = cache_.getInternalFqn(joe); + Fqn<?> janesInternalFqn = cache_.getInternalFqn(jane); HashSet<Reference> expectedReferences = new HashSet<Reference>(Arrays.<Reference> asList( new ReferenceImpl(joesInternalFqn, "address"), new ReferenceImpl(janesInternalFqn, "address"))); @@ -129,7 +129,7 @@ DoubleRef doubleRef = new DoubleRef(); cache_.attach("/doubleref", doubleRef); - Fqn sourceFqn = cache_.getInternalFqn(doubleRef); + Fqn<?> sourceFqn = cache_.getInternalFqn(doubleRef); HashSet<Reference> expectedReferences = new HashSet<Reference>(Arrays.<Reference> asList( new ReferenceImpl(sourceFqn, "one"), new ReferenceImpl(sourceFqn, "two"))); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -16,12 +16,14 @@ import javax.naming.InitialContext; import javax.transaction.UserTransaction; +import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration; +import org.jboss.cache.lock.TimeoutException; import org.jboss.cache.lock.UpgradeException; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; +import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,7 +37,7 @@ * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004 */ @Test(groups = {"functional"}) -public class LocalConcurrentTest +public class LocalConcurrentTest { static PojoCache cache_; Configuration.CacheMode cachingMode_ = Configuration.CacheMode.LOCAL; @@ -89,7 +91,8 @@ { cachingMode_ = caching_mode; boolean toStart = false; - cache_ = PojoCacheFactory.createCache("configs/local-tx.xml", toStart); + cache_ = PojoCacheFactory.createCache("META-INF/local-service.xml", toStart); + System.out.println(cache_.getCache().getConfiguration().getConcurrencyLevel()); cache_.start(); } @@ -198,13 +201,22 @@ // 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); + try + { + 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); + } + catch (PojoCacheException e) + { + if (! (e.getCause() instanceof TimeoutException)) + throw e; + } } } @@ -256,7 +268,8 @@ break; } } - log("Nodes generated: " + strList.size()); + log("Nodes generated: " + strList); + return strList; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -47,12 +47,10 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; - XmlConfigurationParser parser = new XmlConfigurationParser(); - Configuration expected = parser.parseFile(configFile); + String configFile = "META-INF/local-service.xml"; //expected.setNodeLockingScheme(NodeLockingScheme.MVCC); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(expected, toStart); + cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); } @@ -406,7 +404,7 @@ public void testExists() throws Exception { - Fqn fqn = Fqn.fromString("/person/test1"); + Fqn<String> fqn = Fqn.fromString("/person/test1"); createPerson(fqn.toString(), "Joe Black", 32); assertTrue(cache_.exists(fqn)); assertFalse(cache_.exists(Fqn.fromString("/blah"))); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import java.util.concurrent.CountDownLatch; import javax.naming.Context; import javax.naming.InitialContext; @@ -24,10 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; +import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,7 +37,7 @@ */ @Test(groups = {"functional"}) -public class LocalTxTest +public class LocalTxTest { Log log = LogFactory.getLog(LocalTxTest.class); PojoCache cache; @@ -51,7 +52,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); @@ -131,6 +132,8 @@ public void testConcurrentSimplePuts() throws Exception { + final CountDownLatch t2Start = new CountDownLatch(1); + final CountDownLatch t2Finished = new CountDownLatch(1); Thread t1 = new Thread("t1") { public void run() @@ -144,7 +147,8 @@ tx.begin(); // Note that this will create a write lock on p (on the JBossInternal node) p.setAddress(addr); - TestingUtil.sleepThread(17000); + t2Start.countDown(); + t2Finished.await(); tx.commit(); } catch (RollbackException rollback) @@ -165,7 +169,7 @@ UserTransaction tx = null; try { - TestingUtil.sleepThread(1000); // give Thread1 time to createPerson + t2Start.await(); Person p = (Person) cache.find("/person/test6"); Address addr = new Address(); addr.setCity("Santa Clara"); @@ -200,6 +204,10 @@ t2_ex = ex; ex.printStackTrace(); } + finally + { + t2Finished.countDown(); + } } }; @@ -268,6 +276,10 @@ { // } + catch (PojoCacheException e) + { + + } catch (Exception ex) { if (tx != null) Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewLocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewLocalTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewLocalTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -38,7 +38,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -177,7 +177,7 @@ addr.addResidents("Ben"); addr.addResidents("Joe"); // Test serialization first - Fqn fqn = Fqn.fromString("/plain"); + Fqn<String> fqn = Fqn.fromString("/plain"); cache_.getCache().put(fqn, "test", addr); cache_.getCache().remove(fqn, "test"); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -27,8 +27,10 @@ log.info("setUp() ...."); boolean toStart = false; cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NonAspectizedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NonAspectizedTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NonAspectizedTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -28,7 +28,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ObjectGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ObjectGraphTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ObjectGraphTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -27,7 +27,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/RecursiveRefTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/RecursiveRefTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/RecursiveRefTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -13,7 +13,7 @@ @Test(groups = {"functional"}) public class RecursiveRefTest { - private static final String CONFIG_FILENAME = "configs/local-tx.xml"; + private static final String CONFIG_FILENAME = "META-INF/local-service.xml"; private PojoCache cache; Log log = LogFactory.getLog(RecursiveRefTest.class); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -39,7 +39,7 @@ * @author Ben Wang */ @Test(groups = {"functional"}) -public class ReplicatedByteTest +public class ReplicatedByteTest { Log log = LogFactory.getLog(ReplicatedByteTest.class); PojoCache cache, cache1; @@ -52,8 +52,10 @@ log.info("setUp() ...."); boolean toStart = false; cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -34,7 +34,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedCircularGraphTest +public class ReplicatedCircularGraphTest { Log log = LogFactory.getLog(ReplicatedCircularGraphTest.class); PojoCache cache1; @@ -61,6 +61,7 @@ { boolean toStart = false; PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + tree.getCache().getConfiguration().setSyncCommitPhase(true); tree.start(); return tree; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -21,7 +21,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedObjectGraphTest +public class ReplicatedObjectGraphTest { Log log = LogFactory.getLog(ReplicatedObjectGraphTest.class); PojoCache cache1; @@ -48,6 +48,7 @@ { boolean toStart = false; PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + tree.getCache().getConfiguration().setSyncCommitPhase(true); tree.start(); return tree; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -32,7 +32,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedPutWithBulkRemoveTest +public class ReplicatedPutWithBulkRemoveTest { Log log_ = LogFactory.getLog(ReplicatedPutWithBulkRemoveTest.class); PojoCache cache_; @@ -47,6 +47,8 @@ boolean toStart = false; cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_.getCache().getConfiguration().setSyncCommitPhase(true); + cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); cache1_.start(); } @@ -176,7 +178,7 @@ assertEquals("Age should be ", 10, result.getAge()); assertEquals("Zip should be ", 95123, result.getAddress().getZip()); assertEquals("English", result.getLanguages().get(0)); - assertEquals("Spanish", result.getLanguages().get(1)); + assertEquals("Spanish", result.getLanguages().get(1)); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -47,6 +47,8 @@ boolean toStart = false; cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_.getCache().getConfiguration().setSyncCommitPhase(true); + cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); cache1_.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -24,7 +24,7 @@ * @author Ben Wang */ @Test(groups = {"functional"}) -public class ReplicatedTest +public class ReplicatedTest { Log log = LogFactory.getLog(ReplicatedTest.class); PojoCache cache, cache1; @@ -35,8 +35,12 @@ log.info("setUp() ...."); boolean toStart = false; cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + + cache.getCache().getConfiguration().setSyncCommitPhase(true); + cache1.getCache().getConfiguration().setSyncCommitPhase(true); + cache.start(); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.start(); } @@ -53,7 +57,7 @@ { return createPerson(id, name, age, null); } - + private Person createPerson(String id, String name, int age, Map<String, String> map) { Person p = new Person(map); @@ -119,13 +123,13 @@ ((Person) cache1.find("/person/test1")).getCurrentStatus()); cache.detach("/person/test1"); } - + public void testFinal() throws Exception { Person jason = createPerson("/person/test1", "Jason Greene", 28, new HashMap<String, String>()); jason.getFinalMap().put("test1", "testa"); jason.getFinalMap().put("test2", "testb"); - + Person jason2 = (Person) cache1.find("/person/test1"); assertEquals("testa", jason2.getFinalMap().get("test1")); assertEquals("testb", jason2.getFinalMap().get("test2")); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -30,7 +30,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedTxTest +public class ReplicatedTxTest { Log log = LogFactory.getLog(ReplicatedTxTest.class); PojoCache cache, cache1; @@ -47,8 +47,10 @@ log.info("setUp() ...."); boolean toStart = false; cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/TxUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/TxUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/TxUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -47,7 +47,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -38,7 +38,7 @@ * @author Ben Wang */ @Test(groups = {"functional"}) -public class ReplicatedAnnotationTest +public class ReplicatedAnnotationTest { Log log_ = LogFactory.getLog(ReplicatedAnnotationTest.class); PojoCache cache_; @@ -54,6 +54,8 @@ cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_.getCache().getConfiguration().setSyncCommitPhase(true); + cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); cache1_.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -42,7 +42,7 @@ public void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapNullTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapNullTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapNullTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -40,7 +40,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -48,7 +48,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); @@ -376,10 +376,6 @@ } catch (PojoCacheException e) { - Throwable t = e; - - assertTrue("we got expected PojoCacheException " - + t.getCause().getClass().getName(), t.getCause() instanceof PojoCacheException); } map.clear(); cache_.attach("/keytest", map); // this should succeed @@ -392,12 +388,8 @@ ref.put(key, add1); // this should throw RuntimeException with cause of java.io.NotSerializableException fail("failed to get expected runtimeException when putting nonserializable key to pojocache map"); } - catch (RuntimeException e) + catch (PojoCacheException e) { - Throwable t = e; - - assertTrue("we got expected PojoCacheException " - + t.getClass().getName(), t instanceof PojoCacheException); } } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedSetTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedSetTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedSetTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -50,7 +50,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CollectionTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CollectionTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CollectionTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -34,7 +34,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ObjectGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ObjectGraphTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ObjectGraphTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -39,7 +39,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -35,7 +35,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedSyncMapTest +public class ReplicatedSyncMapTest { Log log = LogFactory.getLog(ReplicatedSyncMapTest.class); PojoCache cache1; @@ -62,6 +62,7 @@ { boolean toStart = false; PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -29,7 +29,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedSyncSetTest +public class ReplicatedSyncSetTest { Log log = LogFactory.getLog(ReplicatedSyncSetTest.class); PojoCache cache1; @@ -56,6 +56,7 @@ { boolean toStart = false; PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/demo/JBossCacheGUI.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/demo/JBossCacheGUI.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/demo/JBossCacheGUI.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -595,9 +595,9 @@ private Node getNode(Object[] path) { - Fqn fqnToPath; + Fqn<String> fqnToPath; if (path.length == 0) fqnToPath = Fqn.ROOT; - List<Object> elements = convertMyNodeArrayToStringArray(path); + List<String> elements = convertMyNodeArrayToStringArray(path); fqnToPath = Fqn.fromList(elements); if (root.hasChild(fqnToPath)) { @@ -610,9 +610,9 @@ } } - private List<Object> convertMyNodeArrayToStringArray(Object[] path) + private List<String> convertMyNodeArrayToStringArray(Object[] path) { - List<Object> list = new LinkedList<Object>(); + List<String> list = new LinkedList<String>(); for (Object o : path) { JBossCacheGUI.DisplayNode n = (JBossCacheGUI.DisplayNode) o; @@ -741,7 +741,7 @@ } } - private void load(Fqn fqn) + private void load(Fqn<String> fqn) { try { @@ -1153,19 +1153,19 @@ * Adds a new node to the view. Intermediary nodes will be created if they don't yet exist. * Returns the first node that was created or null if node already existed */ - public JBossCacheGUI.DisplayNode add(Fqn fqn) + public JBossCacheGUI.DisplayNode add(Fqn<String> fqn) { JBossCacheGUI.DisplayNode curr, n, ret = null; if (fqn == null) return null; curr = this; - for (Object child_name : fqn.peekElements()) + for (String child_name : fqn.peekElements()) { - n = curr.findChild(child_name.toString()); + n = curr.findChild(child_name); if (n == null) { - n = new JBossCacheGUI.DisplayNode(child_name.toString()); + n = new JBossCacheGUI.DisplayNode(child_name); if (ret == null) ret = n; curr.add(n); } @@ -1184,16 +1184,16 @@ } - private JBossCacheGUI.DisplayNode findNode(Fqn fqn) + private JBossCacheGUI.DisplayNode findNode(Fqn<String> fqn) { JBossCacheGUI.DisplayNode curr, n; if (fqn == null) return null; curr = this; - for (Object child_name : fqn.peekElements()) + for (String child_name : fqn.peekElements()) { - n = curr.findChild(child_name.toString()); + n = curr.findChild(child_name); if (n == null) { return null; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -33,7 +33,7 @@ */ @Test(groups = {"functional"}) -public class ReplicatedNetworkManagementTest +public class ReplicatedNetworkManagementTest { Log log = LogFactory.getLog(ReplicatedNetworkManagementTest.class); PojoCache cache1; @@ -60,6 +60,7 @@ { boolean toStart = false; PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -14,7 +14,7 @@ import org.testng.annotations.Test; @Test(groups = {"functional"}) -public class ReplicatedPropagationManagerlTest +public class ReplicatedPropagationManagerlTest { private PropagationManager pm_; private PojoCache cache1_; @@ -39,6 +39,7 @@ { boolean toStart = false; PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/InterceptorRegistrationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/InterceptorRegistrationTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/InterceptorRegistrationTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -29,422 +29,422 @@ /** * Tests the interceptor registration function of CacheJmxWrapper. - * + * * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, enabled = false) public class InterceptorRegistrationTest extends PojoCacheJmxWrapperTestBase { +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * cache.start(); +// * wrapper creation and registration. +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans1() throws Exception +// { +// // have to start the cache to have any interceptors +// createCache(createConfiguration()); +// cache.start(); +// +// PojoCacheJmxWrapperMBean wrapper = registerWrapper(cache); +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// // Should still be registered +// interceptorRegistrationTest(true); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * cache.start(); +// * wrapper creation and and start +// * wrapper registration. +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans2() throws Exception +// { +// // have to start the cache to have any interceptors +// createCache(createConfiguration()); +// cache.start(); +// +// PojoCacheJmxWrapperMBean wrapper = new PojoCacheJmxWrapper(cache); +// wrapper.start(); +// wrapper = registerWrapper(wrapper); +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// // Should still be registered +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * Cache not injected +// * wrapper registered; +// * wrapper created and started. +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans3() throws Exception +// { +// PojoCacheJmxWrapperMBean wrapper = registerWrapper(createConfiguration()); +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// // have to start the cache to have any interceptors +// wrapper.create(); +// wrapper.start(); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// // Destroy should unregister if we are managing +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * Cache not injected +// * wrapper created and started. +// * wrapper registered +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans4() throws Exception +// { +// PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); +// +// // have to start the cache to have any interceptors +// wrapper.create(); +// wrapper.start(); +// +// registerWrapper(wrapper); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// // Destroy should unregister if we are managing +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * cache constructed; +// * wrapper constructed and registered with manageCacheLifecycle=true +// * wrapper created and started +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans5() throws Exception +// { +// PojoCacheJmxWrapperMBean wrapper = new PojoCacheJmxWrapper(createCache(createConfiguration())); +//// wrapper.setManageCacheLifecycle(true); +// wrapper = registerWrapper(wrapper); +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// // have to start the cache to have any interceptors +// wrapper.create(); +// wrapper.start(); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// // Destroy should unregister if we are managing +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * cache constructed; +// * wrapper constructed and registered +// * wrapper created and started +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans6() throws Exception +// { +// PojoCacheJmxWrapperMBean wrapper = registerWrapper(); +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// // have to start the cache to have any interceptors +// wrapper.create(); +// wrapper.start(); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Confirms interceptor mbeans are registered if the following events +// * occur: +// * +// * cache constructed; +// * wrapper created and started +// * wrapper registered +// * +// * @throws Exception +// */ +// public void testInterceptorMBeans7() throws Exception +// { +// PojoCacheJmxWrapperMBean wrapper = new PojoCacheJmxWrapper(createCache(createConfiguration())); +// +// // have to start the cache to have any interceptors +// wrapper.create(); +// wrapper.start(); +// +// wrapper = registerWrapper(wrapper); +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(true); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Tests that setting registerInterceptors=false disables interceptor +// * registration when the wrapper is registered before create/start +// * are called. +// * +// * @throws Exception +// */ +// public void testRegisterInterceptors1() throws Exception +// { +// PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); +// wrapper.setRegisterInterceptors(false); +// +// registerWrapper(wrapper); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// wrapper.create(); +// wrapper.start(); +// +// interceptorRegistrationTest(false); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Tests that setting registerInterceptors=false disables interceptor +// * registration when the wrapper is registered after create/start +// * are called. +// * +// * @throws Exception +// */ +// public void testRegisterInterceptors2() throws Exception +// { +// PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); +// wrapper.setRegisterInterceptors(false); +// +// wrapper.create(); +// wrapper.start(); +// +// registerWrapper(wrapper); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(false); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Tests that setting registerPlainCache=false disables interceptor +// * registration when the wrapper is registered before create/start +// * are called. +// * +// * @throws Exception +// */ +// public void testRegisterPlainCache1() throws Exception +// { +// PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); +// wrapper.setRegisterPlainCache(false); +// wrapper.setRegisterInterceptors(true); +// +// registerWrapper(wrapper); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// wrapper.create(); +// wrapper.start(); +// +// interceptorRegistrationTest(false); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// /** +// * Tests that setting registerPlainCache=false disables interceptor +// * registration when the wrapper is registered after create/start +// * are called. +// * +// * @throws Exception +// */ +// public void testRegisterPlainCache2() throws Exception +// { +// PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); +// wrapper.setRegisterPlainCache(false); +// wrapper.setRegisterInterceptors(true); +// +// wrapper.create(); +// wrapper.start(); +// +// registerWrapper(wrapper); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(false); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// public void testExposeManagementStatistics1() throws Exception +// { +// Configuration cfg = createConfiguration(); +// cfg.setExposeManagementStatistics(false); +// +// PojoCacheJmxWrapper wrapper = createWrapper(cfg); +// registerWrapper(cfg); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// wrapper.create(); +// wrapper.start(); +// +// interceptorRegistrationTest(false); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// } +// +// public void testExposeManagementStatistics2() throws Exception +// { +// Configuration cfg = createConfiguration(); +// cfg.setExposeManagementStatistics(false); +// +// PojoCacheJmxWrapper wrapper = createWrapper(cfg); +// +// wrapper.create(); +// wrapper.start(); +// +// registerWrapper(wrapper); +// +// assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); +// +// interceptorRegistrationTest(false); +// +// wrapper.stop(); +// wrapper.destroy(); +// +// interceptorRegistrationTest(false); +// +// unregisterWrapper(); +// +// interceptorRegistrationTest(false); +// +// } +// +// - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * cache.start(); - * wrapper creation and registration. - * - * @throws Exception - */ - public void testInterceptorMBeans1() throws Exception - { - // have to start the cache to have any interceptors - createCache(createConfiguration()); - cache.start(); - - PojoCacheJmxWrapperMBean wrapper = registerWrapper(cache); - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - // Should still be registered - interceptorRegistrationTest(true); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * cache.start(); - * wrapper creation and and start - * wrapper registration. - * - * @throws Exception - */ - public void testInterceptorMBeans2() throws Exception - { - // have to start the cache to have any interceptors - createCache(createConfiguration()); - cache.start(); - - PojoCacheJmxWrapperMBean wrapper = new PojoCacheJmxWrapper(cache); - wrapper.start(); - wrapper = registerWrapper(wrapper); - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - // Should still be registered - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * Cache not injected - * wrapper registered; - * wrapper created and started. - * - * @throws Exception - */ - public void testInterceptorMBeans3() throws Exception - { - PojoCacheJmxWrapperMBean wrapper = registerWrapper(createConfiguration()); - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - // have to start the cache to have any interceptors - wrapper.create(); - wrapper.start(); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - // Destroy should unregister if we are managing - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * Cache not injected - * wrapper created and started. - * wrapper registered - * - * @throws Exception - */ - public void testInterceptorMBeans4() throws Exception - { - PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); - - // have to start the cache to have any interceptors - wrapper.create(); - wrapper.start(); - - registerWrapper(wrapper); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - // Destroy should unregister if we are managing - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * cache constructed; - * wrapper constructed and registered with manageCacheLifecycle=true - * wrapper created and started - * - * @throws Exception - */ - public void testInterceptorMBeans5() throws Exception - { - PojoCacheJmxWrapperMBean wrapper = new PojoCacheJmxWrapper(createCache(createConfiguration())); -// wrapper.setManageCacheLifecycle(true); - wrapper = registerWrapper(wrapper); - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - // have to start the cache to have any interceptors - wrapper.create(); - wrapper.start(); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - // Destroy should unregister if we are managing - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * cache constructed; - * wrapper constructed and registered - * wrapper created and started - * - * @throws Exception - */ - public void testInterceptorMBeans6() throws Exception - { - PojoCacheJmxWrapperMBean wrapper = registerWrapper(); - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - // have to start the cache to have any interceptors - wrapper.create(); - wrapper.start(); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Confirms interceptor mbeans are registered if the following events - * occur: - * - * cache constructed; - * wrapper created and started - * wrapper registered - * - * @throws Exception - */ - public void testInterceptorMBeans7() throws Exception - { - PojoCacheJmxWrapperMBean wrapper = new PojoCacheJmxWrapper(createCache(createConfiguration())); - - // have to start the cache to have any interceptors - wrapper.create(); - wrapper.start(); - - wrapper = registerWrapper(wrapper); - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(true); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Tests that setting registerInterceptors=false disables interceptor - * registration when the wrapper is registered before create/start - * are called. - * - * @throws Exception - */ - public void testRegisterInterceptors1() throws Exception - { - PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); - wrapper.setRegisterInterceptors(false); - - registerWrapper(wrapper); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - wrapper.create(); - wrapper.start(); - - interceptorRegistrationTest(false); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Tests that setting registerInterceptors=false disables interceptor - * registration when the wrapper is registered after create/start - * are called. - * - * @throws Exception - */ - public void testRegisterInterceptors2() throws Exception - { - PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); - wrapper.setRegisterInterceptors(false); - - wrapper.create(); - wrapper.start(); - - registerWrapper(wrapper); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(false); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Tests that setting registerPlainCache=false disables interceptor - * registration when the wrapper is registered before create/start - * are called. - * - * @throws Exception - */ - public void testRegisterPlainCache1() throws Exception - { - PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); - wrapper.setRegisterPlainCache(false); - wrapper.setRegisterInterceptors(true); - - registerWrapper(wrapper); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - wrapper.create(); - wrapper.start(); - - interceptorRegistrationTest(false); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - /** - * Tests that setting registerPlainCache=false disables interceptor - * registration when the wrapper is registered after create/start - * are called. - * - * @throws Exception - */ - public void testRegisterPlainCache2() throws Exception - { - PojoCacheJmxWrapper wrapper = createWrapper(createConfiguration()); - wrapper.setRegisterPlainCache(false); - wrapper.setRegisterInterceptors(true); - - wrapper.create(); - wrapper.start(); - - registerWrapper(wrapper); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(false); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - public void testExposeManagementStatistics1() throws Exception - { - Configuration cfg = createConfiguration(); - cfg.setExposeManagementStatistics(false); - - PojoCacheJmxWrapper wrapper = createWrapper(cfg); - registerWrapper(cfg); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - wrapper.create(); - wrapper.start(); - - interceptorRegistrationTest(false); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - } - - public void testExposeManagementStatistics2() throws Exception - { - Configuration cfg = createConfiguration(); - cfg.setExposeManagementStatistics(false); - - PojoCacheJmxWrapper wrapper = createWrapper(cfg); - - wrapper.create(); - wrapper.start(); - - registerWrapper(wrapper); - - assertTrue("Should be registered", mBeanServer.isRegistered(mBeanName)); - - interceptorRegistrationTest(false); - - wrapper.stop(); - wrapper.destroy(); - - interceptorRegistrationTest(false); - - unregisterWrapper(); - - interceptorRegistrationTest(false); - - } - - - } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/LegacyConfigurationTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -181,7 +181,7 @@ assertEquals("EvictionPolicyConfig", getEvictionPolicyConfig().toString(), wrapper.getEvictionPolicyConfig().toString()); EvictionConfig ec = c.getEvictionConfig(); - assertEquals("EC queue size", 20000, ec.getDefaultEventQueueSize()); + //assertEquals("EC queue size", 20000, ec.getDefaultEventQueueSize()); assertEquals("EC wakeup", 5, ec.getWakeupIntervalSeconds()); assertEquals("EC default pol", LRUPolicy.class.getName(), ec.getDefaultEvictionPolicyClass()); List<EvictionRegionConfig> ercs = ec.getEvictionRegionConfigs(); @@ -248,7 +248,7 @@ " </properties>\n" + " </locator>\n" + " </buddy>"; - return XmlConfigHelper.stringToElement(xmlStr); + return XmlConfigHelper.stringToElementInCoreNS(xmlStr); } protected static Element getCacheLoaderConfig() throws Exception @@ -273,7 +273,7 @@ " <singletonStore enabled=\"false\" /> \n" + " </loader>\n" + " </loaders>"; - return XmlConfigHelper.stringToElement(xmlStr); + return XmlConfigHelper.stringToElementInCoreNS(xmlStr); } protected static Element getEvictionPolicyConfig() throws Exception @@ -296,7 +296,7 @@ " <attribute name=\"maxAgeSeconds\">10</attribute>\n" + "</region>\n" + " </eviction>"; - return XmlConfigHelper.stringToElement(xmlStr); + return XmlConfigHelper.stringToElementInCoreNS(xmlStr); } protected static Element getClusterConfig() throws Exception @@ -352,7 +352,7 @@ " <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" + " <pbcast.FLUSH timeout=\"0\"/>\n" + "</jgroupsConfig>"; -return XmlConfigHelper.stringToElement(xml); +return XmlConfigHelper.stringToElementInCoreNS(xml); } class MockInvocationHandler implements InvocationHandler Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -16,7 +16,7 @@ * @version $Id$ */ @Test(groups = {"functional"}) -public class NotificationTest extends org.jboss.cache.jmx.NotificationTest +public class NotificationTest extends org.jboss.cache.jmx.deprecated.NotificationTest { private PojoCache pojoCache; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapperTestBase.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapperTestBase.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapperTestBase.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -22,7 +22,7 @@ * @author Brian Stansberry */ @Test(groups = {"functional"}) -public class PojoCacheJmxWrapperTestBase +public class PojoCacheJmxWrapperTestBase { public static final String PC_PREFIX = JmxUtil.POJO_CACHE_DOMAIN + ":" + JmxUtil.SERVICE_KEY_NAME + "=PojoCacheJmxWrapperTest," + @@ -151,6 +151,7 @@ mBeanServer.unregisterMBean(mBeanName); } + /* protected void interceptorRegistrationTest(boolean expectMbeans) throws MalformedObjectNameException, NullPointerException { interceptorRegistrationTest(plainCacheMBeanNameStr, expectMbeans); @@ -173,4 +174,5 @@ assertFalse(n + " should not be registered", mBeanServer.isRegistered(n)); } } + */ } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -72,13 +72,13 @@ ClassLoader cla = getClassLoader(); WeakReference<ClassLoader> refa = new WeakReference<ClassLoader>(cla); - cache_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(cla); + cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(cla); ClassLoader clb = getClassLoader(); WeakReference<ClassLoader> refb = new WeakReference<ClassLoader>(clb); - cache_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(clb); + cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(clb); - Fqn fqn = Fqn.fromString("/aop"); - cache_.getCache().put(Fqn.fromString("/aop"), "add", add); + Fqn<String> fqn = new Fqn<String>("/aop"); + cache_.getCache().put(new Fqn<String>("/aop"), "add", add); TestingUtil.sleepThread(100); try @@ -97,8 +97,8 @@ ClassLoader clc = getClassLoader(); cla = null; clb = null; - cache_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(clc); - cache1_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(clc); + cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(clc); + cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(clc); System.gc(); // force gc Thread.sleep(1000); assertNull("Classloader should be gced ", refa.get()); @@ -140,9 +140,9 @@ ClassLoader cla = getClassLoader(); WeakReference<ClassLoader> refa = new WeakReference<ClassLoader>(cla); - cache_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(cla); + cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(cla); ClassLoader clb = getClassLoader(); - cache1_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(clb); + cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(clb); WeakReference<ClassLoader> refb = new WeakReference<ClassLoader>(clb); cache_.attach("/aop", p); @@ -161,8 +161,8 @@ cache_.detach("/aop"); ClassLoader clc = getClassLoader(); - cache_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(clc); - cache1_.getCache().getRegion(Fqn.fromString("/aop"), true).registerContextClassLoader(clc); + cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(clc); + cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).registerContextClassLoader(clc); cla = null; clb = null; forceOutOfMemoryError(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -55,7 +55,7 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListenerCountTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListenerCountTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ListenerCountTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -31,7 +31,7 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/MapTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -54,7 +54,7 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ObjectTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -40,7 +40,7 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -52,8 +52,10 @@ { Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); + config.setSyncCommitPhase(true); Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); + config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); cache.start(); listenerCache = PojoCacheFactory.createCache(config2, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -52,8 +52,10 @@ { Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); + config.setSyncCommitPhase(true); Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); + config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); cache.start(); listenerCache = PojoCacheFactory.createCache(config2, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -52,8 +52,10 @@ { Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); + config.setSyncCommitPhase(true); Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); + config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); cache.start(); listenerCache = PojoCacheFactory.createCache(config2, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -52,8 +52,10 @@ { Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); + config.setSyncCommitPhase(true); Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); + config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); cache.start(); listenerCache = PojoCacheFactory.createCache(config2, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/SetTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/SetTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/SetTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -55,7 +55,7 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/TxObjectTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/TxObjectTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/TxObjectTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -58,7 +58,7 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache = PojoCacheFactory.createCache(configFile, toStart); cache.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/LocalTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/LocalTxTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/LocalTxTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -142,7 +142,7 @@ { log.info("testFailure1() ...."); UserTransaction tx = getTransaction(); - Fqn f = Fqn.fromString("/person/test2"); + Fqn<String> f = Fqn.fromString("/person/test2"); tx.begin(); cache.getCache().put(f, "test", "test"); tx.commit(); @@ -155,9 +155,9 @@ public void testFailure2() throws Exception { - Fqn f0 = Fqn.fromString("/person/test"); - Fqn f1 = Fqn.fromRelativeElements(f0, "1"); - Fqn f2 = Fqn.fromRelativeElements(f0, "2"); + Fqn<String> f0 = Fqn.fromString("/person/test"); + Fqn<String> f1 = new Fqn<String>(f0, "1"); + Fqn<String> f2 = new Fqn<String>(f0, "2"); cache.getCache().put(f1, "test", "test"); cache.getCache().put(f2, "test", "test"); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/passivation/LocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/passivation/LocalTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/passivation/LocalTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -47,7 +47,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-passivation.xml"; + String configFile = "META-INF/pojocache-passivation-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.getCache().getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.BatchModeTransactionManagerLookup"); @@ -101,7 +101,7 @@ cache_.attach(id, joe); Thread.sleep(9100);// default is 3 seconds so joe should have been passivated. - assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(Fqn.fromString(id), false)); + assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(new Fqn<String>(id), false)); assertEquals("age ", 20, joe.getAge()); joe.setAge(30); @@ -118,7 +118,7 @@ cache_.attach(id, joe); Thread.sleep(9100);// default is 3 seconds so joe should have been passivated. - assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(Fqn.fromString(id), false)); + assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(new Fqn<String>(id), false)); Address addr = new Address(); addr.setCity("Taipei"); @@ -137,7 +137,7 @@ cache_.attach(id, joe); Thread.sleep(9100);// default is 3 seconds so joe should have been passivated. - assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(Fqn.fromString(id), false)); + assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(new Fqn<String>(id), false)); Person p = (Person) cache_.find(id); @@ -182,7 +182,7 @@ Thread.sleep(9100);// default is 3 seconds so joe should have been passivated. - assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(Fqn.fromString(id), false)); + assertNull("Node should be evicted ", ((CacheSPI<Object, Object>) cache_.getCache()).peek(new Fqn<String>(id), false)); assertEquals("City is ", "Santa Clara", add2.getCity()); @@ -268,7 +268,7 @@ @NodeActivated public void nodeActivated(NodeEvent ne) { - Fqn fqn = ne.getFqn(); + Fqn<?> fqn = ne.getFqn(); if (!ne.isPre()) { System.out.println("nodeActivated: " + fqn); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -16,9 +16,11 @@ import javax.transaction.UserTransaction; import org.jboss.cache.Fqn; +import org.jboss.cache.lock.TimeoutException; import org.jboss.cache.lock.UpgradeException; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.PojoCache; +import org.jboss.cache.pojo.PojoCacheException; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; @@ -35,7 +37,7 @@ * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004 */ @Test(groups = {"functional"}) -public class LocalConcurrentTest +public class LocalConcurrentTest { static PojoCache cache_; Properties p_; @@ -47,22 +49,10 @@ 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_); @@ -73,21 +63,14 @@ 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("configs/local-tx.xml", toStart); + cache_ = PojoCacheFactory.createCache("META-INF/local-service.xml", toStart); + cache_.getCache().getConfiguration().setConcurrencyLevel(50); cache_.start(); } @@ -195,13 +178,21 @@ // 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); + try + { + 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); + } + catch (PojoCacheException e) + { + if (! (e.getCause() instanceof TimeoutException)) + throw e; + } } } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -52,7 +52,7 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); @@ -102,8 +102,8 @@ assertEquals((Object) "Joe Black", p.getName()); assertTrue("Region node should exist ", - cache_.getCache().getRoot().hasChild(Fqn.fromString(REGION))); - Fqn fqn = Fqn.fromRelativeFqn(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); + cache_.getCache().getRoot().hasChild(new Fqn<String>(REGION))); + Fqn<String> fqn = new Fqn<String>(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); assertTrue("Internal region node should exist ", cache_.getCache().getRoot().hasChild(fqn)); //System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<Object, Object>)cache_.getCache()).printDetails()); @@ -125,7 +125,7 @@ //String str = ((CacheImpl<Object, Object>) cache_.getCache()).printDetails(); //System.out.println("**** Details ***/n" + str); - Fqn fqn = Fqn.fromRelativeFqn(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); + Fqn<String> fqn = new Fqn<String>(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); Node<Object, Object> n = cache_.getCache().getRoot().getChild(fqn); assertTrue("Internal region node should not exist ", n.getChildren() != null); @@ -200,7 +200,7 @@ cache_.detach("person/test1"); - Fqn fqn = Fqn.fromRelativeFqn(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); + Fqn<String> fqn = new Fqn<String>(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); Node<Object, Object> n = cache_.getCache().getRoot().getChild(fqn); assertTrue("Internal region node should not exist ", n.getChildren() != null); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/NewLocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/NewLocalTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/NewLocalTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -41,7 +41,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -44,8 +44,10 @@ log.info("setUp() ...."); boolean toStart = false; cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); cache.getCache().getRegion(Fqn.fromString("SESSION"), true); cache1.getCache().getRegion(Fqn.fromString("SESSION"), true); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/InMemoryTxUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/InMemoryTxUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/InMemoryTxUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -47,7 +47,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListTxUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListTxUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListTxUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalExceptionUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalExceptionUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalExceptionUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -64,7 +64,7 @@ public void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.getCache().getConfiguration().setLockAcquisitionTimeout(500); // timeout to 500 ms @@ -173,11 +173,11 @@ { try { - Fqn f = Fqn.fromString(InternalConstant.JBOSS_INTERNAL_STRING); - cache_.getCache().put(Fqn.fromRelativeElements(f, "123"), "key", "test"); - cache_.getCache().put(Fqn.fromString("a"), "key", "test"); + Fqn<String> f = new Fqn<String>(InternalConstant.JBOSS_INTERNAL_STRING); tx_mgr.begin(); - cache_.getCache().put(Fqn.fromRelativeElements(f, "124"), "key", "test"); + cache_.getCache().put(new Fqn<String>(f, "123"), "key", "test"); + cache_.getCache().put(new Fqn<String>("a"), "key", "test"); + cache_.getCache().put(new Fqn<String>(f, "124"), "key", "test"); while (!isTrue) { Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalTxUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalTxUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalTxUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapTxUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapTxUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapTxUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -45,7 +45,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/PojoCollectionRollbackTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/PojoCollectionRollbackTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/PojoCollectionRollbackTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -58,7 +58,7 @@ private void startTest() throws Exception { - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -56,8 +56,10 @@ log.info("setUp() ...."); boolean toStart = false; cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetTxUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetTxUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetTxUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/util/ObjectUtilTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/util/ObjectUtilTest.java 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/util/ObjectUtilTest.java 2008-09-17 23:24:20 UTC (rev 6747) @@ -32,7 +32,7 @@ protected void setUp() throws Exception { log_.info("setUp() ...."); - String configFile = "configs/local-tx.xml"; + String configFile = "META-INF/local-service.xml"; boolean toStart = false; cache_ = PojoCacheFactory.createCache(configFile, toStart); cache_.start(); Modified: pojo/trunk/src/test/resources/META-INF/unit-test-cache-service.xml =================================================================== --- pojo/trunk/src/test/resources/META-INF/unit-test-cache-service.xml 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/resources/META-INF/unit-test-cache-service.xml 2008-09-17 23:24:20 UTC (rev 6747) @@ -171,7 +171,7 @@ max_bundle_timeout="30" use_incoming_packet_handler="true" ip_ttl="2" - enable_bundling="true" + enable_bundling="false" enable_diagnostics="true" use_concurrent_stack="true" Modified: pojo/trunk/src/test/resources/log4j.xml =================================================================== --- pojo/trunk/src/test/resources/log4j.xml 2008-09-17 15:42:17 UTC (rev 6746) +++ pojo/trunk/src/test/resources/log4j.xml 2008-09-17 23:24:20 UTC (rev 6747) @@ -31,7 +31,7 @@ <!-- Rollover at the top of each hour <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/> --> - <param name="Threshold" value="DEBUG"/> + <param name="Threshold" value="TRACE"/> <layout class="org.apache.log4j.PatternLayout"> <!-- The default pattern: Date Priority [Category] Message\n -->