[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/aop/collection ...
Manik Surtani
msurtani at jboss.com
Thu Jul 20 07:48:25 EDT 2006
User: msurtani
Date: 06/07/20 07:48:25
Modified: tests/functional/org/jboss/cache/aop/collection
CachedListAopTest.java CachedListAopTxTest.java
CachedMapAopTest.java CachedSetAopTest.java
ObjectGraphAopTest.java ReplicatedSyncMapTest.java
Log:
migrated to new configurators
Revision Changes Path
1.10 +7 -4 JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedListAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedListAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedListAopTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CachedListAopTest.java 25 Apr 2006 06:38:21 -0000 1.9
+++ CachedListAopTest.java 20 Jul 2006 11:48:25 -0000 1.10
@@ -7,9 +7,13 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.aop.PojoCache;
import org.jboss.cache.aop.test.Address;
-import org.jboss.cache.PropertyConfigurator;
+import org.jboss.cache.factories.XmlConfigurationParser;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
//import org.jboss.test.JBossTestCase;
@@ -38,8 +42,7 @@
log.info("setUp() ....");
String configFile = "META-INF/local-service.xml";
cache_ = new PojoCache();
- PropertyConfigurator config = new PropertyConfigurator();
- config.configure(cache_, configFile); // read in generic replSync xml
+cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
cache_.start();
}
1.5 +2 -8 JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedListAopTxTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedListAopTxTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedListAopTxTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CachedListAopTxTest.java 9 May 2006 10:57:00 -0000 1.4
+++ CachedListAopTxTest.java 20 Jul 2006 11:48:25 -0000 1.5
@@ -5,13 +5,8 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.PropertyConfigurator;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.jboss.cache.transaction.DummyUserTransaction;
import org.jboss.cache.aop.PojoCache;
-import org.jboss.cache.aop.test.Address;
-
-import java.util.Iterator;
+import org.jboss.cache.factories.XmlConfigurationParser;
/**
@@ -36,8 +31,7 @@
log.info("setUp() ....");
String configFile = "META-INF/cache-config.xml";
cache_ = new PojoCache();
- PropertyConfigurator config = new PropertyConfigurator();
- config.configure(cache_, configFile); // read in generic replSync xml
+ cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
cache_.start();
}
1.12 +8 -4 JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedMapAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedMapAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedMapAopTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CachedMapAopTest.java 25 Apr 2006 06:38:21 -0000 1.11
+++ CachedMapAopTest.java 20 Jul 2006 11:48:25 -0000 1.12
@@ -6,11 +6,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.aop.proxy.ClassProxy;
-import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.aop.PojoCache;
import org.jboss.cache.aop.test.Address;
+import org.jboss.cache.factories.XmlConfigurationParser;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
//import org.jboss.test.JBossTestCase;
@@ -37,8 +42,7 @@
log.info("setUp() ....");
String configFile = "META-INF/local-service.xml";
cache_ = new PojoCache();
- PropertyConfigurator config = new PropertyConfigurator();
- config.configure(cache_, configFile); // read in generic replSync xml
+ cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
cache_.start();
stage();
1.14 +12 -5 JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedSetAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachedSetAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/CachedSetAopTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- CachedSetAopTest.java 25 Apr 2006 06:38:21 -0000 1.13
+++ CachedSetAopTest.java 20 Jul 2006 11:48:25 -0000 1.14
@@ -7,11 +7,19 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.aop.PojoCache;
import org.jboss.cache.aop.test.Address;
-import org.jboss.cache.PropertyConfigurator;
+import org.jboss.cache.factories.XmlConfigurationParser;
-import java.util.*;
-import java.io.StringWriter;
import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
//import org.jboss.test.JBossTestCase;
@@ -37,8 +45,7 @@
log.info("setUp() ....");
String configFile = "META-INF/local-service.xml";
cache_ = new PojoCache();
- PropertyConfigurator config = new PropertyConfigurator();
- config.configure(cache_, configFile); // read in generic replSync xml
+ cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
cache_.start();
stage();
1.8 +8 -4 JBossCache/tests/functional/org/jboss/cache/aop/collection/ObjectGraphAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ObjectGraphAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/ObjectGraphAopTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ObjectGraphAopTest.java 9 Apr 2006 12:33:49 -0000 1.7
+++ ObjectGraphAopTest.java 20 Jul 2006 11:48:25 -0000 1.8
@@ -8,9 +8,14 @@
import org.jboss.cache.aop.PojoCache;
import org.jboss.cache.aop.test.Address;
import org.jboss.cache.aop.test.Person;
-import org.jboss.cache.PropertyConfigurator;
+import org.jboss.cache.factories.XmlConfigurationParser;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Test object graph handling in aop, e.g., circular reference, multiple reference, link, etc.
@@ -34,8 +39,7 @@
// String configFile = "META-INF/local-service.xml";
String configFile = "META-INF/local-service.xml";
cache_ = new PojoCache();
- PropertyConfigurator config = new PropertyConfigurator();
- config.configure(cache_, configFile); // read in generic replSync xml
+ cache_.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
cache_.start();
}
1.6 +7 -4 JBossCache/tests/functional/org/jboss/cache/aop/collection/ReplicatedSyncMapTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedSyncMapTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/collection/ReplicatedSyncMapTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ReplicatedSyncMapTest.java 20 Jul 2006 10:54:00 -0000 1.5
+++ ReplicatedSyncMapTest.java 20 Jul 2006 11:48:25 -0000 1.6
@@ -8,9 +8,13 @@
import org.jboss.cache.aop.PojoCache;
import org.jboss.cache.aop.test.Address;
import org.jboss.cache.aop.test.Person;
-import org.jboss.cache.PropertyConfigurator;
+import org.jboss.cache.factories.XmlConfigurationParser;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* Test replicated Map
@@ -47,8 +51,7 @@
private PojoCache createCache(String name) throws Exception {
PojoCache tree=new PojoCache();
- PropertyConfigurator config=new PropertyConfigurator();
- config.configure(tree, "META-INF/replSync-service.xml"); // read in generic replAsync xml
+ tree.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
tree.getConfiguration().setClusterName(name);
tree.createService();
tree.startService();
More information about the jboss-cvs-commits
mailing list