JBoss Cache SVN: r7944 - enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE.
by jbosscache-commits@lists.jboss.org
Author: jdimanos(a)jboss.com
Date: 2009-03-27 21:37:00 -0400 (Fri, 27 Mar 2009)
New Revision: 7944
Modified:
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Configuration.po
Log:
update
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Configuration.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Configuration.po 2009-03-27 23:19:07 UTC (rev 7943)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Configuration.po 2009-03-28 01:37:00 UTC (rev 7944)
@@ -1,24 +1,26 @@
+# translation of Configuration.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Configuration\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-03-28 12:36+1100\n"
+"Last-Translator: \n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Configuration.xml:5
#, no-c-format
msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
#. Tag: para
#: Configuration.xml:6
@@ -30,13 +32,13 @@
"JGroups stack, for example, are still the same. There are two differences, "
"however, when using the xml file--- configuring as a MBean service and "
"eviction policy."
-msgstr ""
+msgstr "Da PojoCache vom TreeCache erbt, sind die Attribute der xml-Konfigurationsdatei nahezu identisch mit denen des letzteren. Attribute wie etwa Replikationsmodus, Transaktions-Manager, Räumungsrichtlinien (sog. \"Eviction Policy\"), Cache-Lader und JGroups-Stack sind nach wie vor dieselben. Es gibt jedoch zwei Unterschiede bei der Verwendung der xml-Datei--- die Konfiguration als MBean-Dienst und Räumungsrichtlinien."
#. Tag: title
#: Configuration.xml:9
#, no-c-format
msgid "PojoCache MBean service"
-msgstr ""
+msgstr "PojoCache MBean-Dienst"
#. Tag: para
#: Configuration.xml:10
@@ -49,12 +51,15 @@
"\"jboss.cache:service=PojoCache\"></programlisting> You can modify the "
"object service name to your liking, of course."
msgstr ""
+"PojoCache kann auch als MBean-Dienst unter dem JBoss Applikationsserver deployt werden. Zur Instantiierung werden Sie jedoch die korrekte Klasse verwenden müssen. Dies etwa is der Code-Schnipsel für das MBean-Attribut in der xml-Datei: "
+"<programlisting><mbean code=\"org.jboss.cache.aop.PojoCache\" name="
+"\"jboss.cache:service=PojoCache\"></programlisting> Sie können den Objekt-Dienstnamen natürlich gemäß Ihren eigenen Wünschen ändern."
#. Tag: title
#: Configuration.xml:14
#, no-c-format
msgid "PojoCache eviction policy"
-msgstr ""
+msgstr "PojoCache Eviction Policy"
#. Tag: para
#: Configuration.xml:15
@@ -68,6 +73,13 @@
"world, a unit is a FQN node, while in the aop world, the concept of a unit "
"is an object (which can have multiple nodes and children nodes!)."
msgstr ""
+"PojoCache bietet außerdem eine Eviction Policy, <literal>org.jboss.cache.aop."
+"eviction.AopLRUPolicy</literal> , bei der es sich um eine Subklasse von <literal>org.jboss."
+"cache.eviction.LRUPolicy</literal> (mit denselben Konfigurationsparametern) handelt. "
+"Wir benötigen eine charakteristische Implementierung da die Eviction in "
+"PojoCache sich vom regulären TreeCache unterscheidet. Beim regulären Cache "
+"ist eine Einheit ein FQN-Node, während bei aop das Konzept einer Einheit ein Objekt ist "
+" (das mehrere Nodes und untergeordnete Nodes besitzen kann!)."
#. Tag: para
#: Configuration.xml:18
@@ -81,6 +93,9 @@
"reference. So all operations will succeed but then a user has no way of "
"knowing that it is merely updating the in-memory reference!"
msgstr ""
+"Außerdem soll, nachdem ein Nutzer eine POJO-Referenz erhalten hat, alles transparent sein,"
+"das heißt Cache-Abruf und Aktualisierungsvorgänge. Wird eine Objekt aber ausgewiesen (\"evicted\"), so bedeutet dies, dass kein <literal>CacheInterceptor</literal> für das POJO existiert, und die Inhalte werden nicht vom Cache abgefangen. "
+"Stattdessen wird jeder Operationsvorgang zur \"In-Memory\"-Referenz geleitet. Das bedeutet, dass alle Operationsvorgänge erfolgreich sind, der Nutzer dies allerdings nicht wissen kann und nur die \"In-Memory\"-Referenz aktualisiert wird!"
#. Tag: para
#: Configuration.xml:21
@@ -94,3 +109,6 @@
"persistent all time unless a specific user-based <literal>removeObject</"
"literal> is called."
msgstr ""
+"Um dieses Problem zu beheben ist es derzeit notwendig, dass die Eviction Policy in Kombination mit einem Cache-Lader verwendet wird, um die Daten zu persistieren. Dabei kann es sich entweder um Persistenz oder Passivierung handel (z.B. es wird nur bei Ausweisung/Räumung persistiert). In diesem Fall wird - ist der Node nicht verfügbar - dieser vom persistenten Speicher abgerufen. Der Nachteil ist, dass das POJO nicht transient ist, z.B. es ist immer persistent außer ein spezifisches, Nutzer-basiertes <literal>removeObject</"
+"literal> wird aufgerufen."
+
15 years, 9 months
JBoss Cache SVN: r7943 - enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE.
by jbosscache-commits@lists.jboss.org
Author: jdimanos(a)jboss.com
Date: 2009-03-27 19:19:07 -0400 (Fri, 27 Mar 2009)
New Revision: 7943
Modified:
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Colophon.po
Log:
update
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Colophon.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Colophon.po 2009-03-25 14:59:23 UTC (rev 7942)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/de-DE/Colophon.po 2009-03-27 23:19:07 UTC (rev 7943)
@@ -4,7 +4,7 @@
"Project-Id-Version: Colophon\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2009-03-19 19:29+1100\n"
+"PO-Revision-Date: 2009-03-28 10:14+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -62,5 +62,5 @@
#: Colophon.xml:14
#, no-c-format
msgid "Extensive review and rough drafts of Section 1.3, 1.4, and 1.5"
-msgstr ""
+msgstr "Umfassende Übersicht und grobe Entwürfe der Abschnitte 1.3, 1.4 und 1.5"
15 years, 9 months
RE: UK Pharmacy Discount ID 17865391
by 1917-2009 Pfizer Inc.
About this mailing:
You are receiving this e-mail because you subscribed to MSN Featured Offers. Microsoft respects your privacy. If you do not wish to receive this MSN Featured Offers e-mail, please click the "Unsubscribe" link below. This will not unsubscribe you from e-mail communications from third-party advertisers that may appear in MSN Feature Offers. This shall not constitute an offer by MSN. MSN shall not be responsible or liable for the advertisers' content nor any of the goods or service advertised. Prices and item availability subject to change without notice.
©2009 Microsoft | Unsubscribe at http://gegyawul.cn | More news at http://gegyawul.cn | Prvacy at http://gegyawul.cn
Microsoft Corporation, One Microsoft Way, Redmond, WA 98052
15 years, 9 months
JBoss Cache SVN: r7942 - in pojo/trunk/src/test/java/org/jboss/cache/pojo: annotation and 8 other directories.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-03-25 10:59:23 -0400 (Wed, 25 Mar 2009)
New Revision: 7942
Modified:
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/EnumTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.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/ReplicatedNonSerializableTest.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/annotation/ReplicatedAnnotationTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.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/integrated/NetworkManagementTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.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/memory/ReplicatedTest.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/optimistic/AbstractOptimisticTestCase.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java
pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java
Log:
Updated tests
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -8,14 +8,10 @@
package org.jboss.cache.pojo;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Queue;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.notifications.annotation.CacheListener;
import org.jboss.cache.notifications.annotation.NodeActivated;
import org.jboss.cache.notifications.annotation.NodeCreated;
@@ -36,6 +32,10 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Queue;
+
/**
* Basic PojoCache test case.
*
@@ -51,11 +51,11 @@
protected void setUp() throws Exception
{
log.info("setUp() ....");
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false);
//cache1.getCache().addCacheListener(new MyCacheListener(false));
cache1.start();
- cache2 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false);
+ cache2 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), 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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -35,7 +35,7 @@
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.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.test.Person;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -58,11 +58,11 @@
{
log.info("setUp() ....");
boolean toStart = false;
- Configuration cfg1 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration cfg1 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
addBuddyReplication(cfg1);
cache = PojoCacheFactory.createCache(cfg1, toStart);
- Configuration cfg2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration cfg2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
addBuddyReplication(cfg2);
cache1 = PojoCacheFactory.createCache(cfg2, toStart);
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.annotation.Replicable;
import org.jboss.cache.pojo.test.EnumPlanet;
import org.testng.annotations.AfterMethod;
@@ -78,8 +78,8 @@
{
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_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.getCache().getConfiguration().setSyncCommitPhase(true);
cache1_.getCache().getConfiguration().setSyncCommitPhase(true);
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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -13,7 +13,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.SpecialSerializedAddress;
@@ -44,8 +44,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
}
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
@@ -60,8 +60,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -3,7 +3,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.annotation.Replicable;
import org.testng.AssertJUnit;
import org.testng.annotations.AfterClass;
@@ -26,10 +26,10 @@
{
log.info("setUp() ....");
boolean toStart = false;
- cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache.start();
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.getCache().getConfiguration().setSyncCommitPhase(true);
cache1.start();
}
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -28,7 +28,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -49,10 +49,10 @@
{
log.info("setUp() ....");
boolean toStart = false;
- Configuration cfg1 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL);
+ Configuration cfg1 = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL);
cache = PojoCacheFactory.createCache(cfg1, toStart);
cache.start();
- Configuration cfg2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL);
+ Configuration cfg2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL);
cache1 = PojoCacheFactory.createCache(cfg2, toStart);
cache1.start();
}
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.test.Resource;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -51,10 +51,10 @@
{
log.info("setUp() ....");
boolean toStart = false;
- cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache.start();
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -18,7 +18,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.pojo.test.Link;
import org.jboss.cache.pojo.test.NodeManager;
@@ -60,7 +60,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache tree = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
tree.getCache().getConfiguration().setSyncCommitPhase(true);
tree.start();
return tree;
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -7,18 +7,17 @@
package org.jboss.cache.pojo;
-import java.util.Properties;
-
-import javax.naming.Context;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import javax.naming.Context;
+import java.util.Properties;
+
/**
* New NewReplicatedAopTest that doesn't use TreeCacheAopTester.
*
@@ -39,8 +38,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
cache1_.start();
}
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -6,7 +6,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
@@ -47,7 +47,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache tree = PojoCacheFactory.createCache(UnitTestConfigurationFactory.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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -18,7 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.test.Address;
import org.jboss.cache.pojo.test.Person;
import org.testng.annotations.AfterMethod;
@@ -45,8 +45,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.getCache().getConfiguration().setSyncCommitPhase(true);
cache1_.getCache().getConfiguration().setSyncCommitPhase(true);
cache_.start();
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -18,7 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.test.CacheObject;
import org.jboss.cache.pojo.test.Student;
import org.testng.annotations.AfterMethod;
@@ -45,8 +45,8 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.getCache().getConfiguration().setSyncCommitPhase(true);
cache1_.getCache().getConfiguration().setSyncCommitPhase(true);
cache_.start();
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -11,7 +11,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.Student;
import org.testng.annotations.AfterMethod;
@@ -34,8 +34,8 @@
{
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 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache1.getCache().getConfiguration().setSyncCommitPhase(true);
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -18,7 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.transaction.DummyTransactionManager;
@@ -46,10 +46,10 @@
{
log.info("setUp() ....");
boolean toStart = false;
- cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache.start();
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.getCache().getConfiguration().setSyncCommitPhase(true);
cache1.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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.Gadget;
@@ -51,9 +51,9 @@
Properties prop = new Properties();
prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.getCache().getConfiguration().setSyncCommitPhase(true);
cache1_.getCache().getConfiguration().setSyncCommitPhase(true);
cache_.start();
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -1,21 +1,19 @@
package org.jboss.cache.pojo.collection;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* List implementation testing.
*
@@ -33,9 +31,9 @@
{
log.info("setUp() ....");
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.getCache().getConfiguration().setFetchInMemoryState(false);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1_.getCache().getConfiguration().setFetchInMemoryState(false);
cache_.start();
cache1_.start();
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.testng.annotations.AfterMethod;
@@ -55,9 +55,9 @@
{
log.info("setUp() ....");
boolean toStart = true;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
}
@AfterMethod(alwaysRun = true)
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -13,7 +13,7 @@
import org.jboss.aop.proxy.ClassProxy;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheAlreadyDetachedException;
import org.jboss.cache.pojo.PojoCacheFactory;
@@ -56,7 +56,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.start();
return cache;
}
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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -17,7 +17,7 @@
import org.jboss.aop.proxy.ClassProxy;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheException;
import org.jboss.cache.pojo.PojoCacheFactory;
@@ -61,7 +61,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -13,7 +13,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.Address;
@@ -55,7 +55,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.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/NetworkManagementTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/NetworkManagementTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/NetworkManagementTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -9,7 +9,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.NetworkAdmin;
@@ -56,7 +56,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.start();
return cache;
}
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -2,7 +2,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.propagation.PropagationManager;
@@ -33,7 +33,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.start();
return cache;
}
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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -9,7 +9,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.NetworkAdmin;
@@ -59,7 +59,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -4,7 +4,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.propagation.PropagationManager;
@@ -38,7 +38,7 @@
private PojoCache createCache(String name) throws Exception
{
boolean toStart = false;
- PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache.start();
return cache;
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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -18,7 +18,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
@@ -45,9 +45,9 @@
protected void setUp() throws Exception
{
boolean toStart = false;
- cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache_.start();
- cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1_.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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -27,7 +27,7 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.notification.event.Event;
@@ -50,10 +50,10 @@
@BeforeMethod(alwaysRun = true)
protected void setUp() throws Exception
{
- Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config.setFetchInMemoryState(false);
config.setSyncCommitPhase(true);
- Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config2.setFetchInMemoryState(false);
config2.setSyncCommitPhase(true);
cache = PojoCacheFactory.createCache(config, 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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -27,7 +27,7 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.notification.event.Event;
@@ -50,10 +50,10 @@
@BeforeMethod(alwaysRun = true)
protected void setUp() throws Exception
{
- Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config.setFetchInMemoryState(false);
config.setSyncCommitPhase(true);
- Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config2.setFetchInMemoryState(false);
config2.setSyncCommitPhase(true);
cache = PojoCacheFactory.createCache(config, 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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -27,7 +27,7 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.notification.event.Event;
@@ -50,10 +50,10 @@
@BeforeMethod(alwaysRun = true)
protected void setUp() throws Exception
{
- Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config.setFetchInMemoryState(false);
config.setSyncCommitPhase(true);
- Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config2.setFetchInMemoryState(false);
config2.setSyncCommitPhase(true);
cache = PojoCacheFactory.createCache(config, 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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -27,7 +27,7 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.notification.event.Event;
@@ -50,10 +50,10 @@
@BeforeMethod(alwaysRun = true)
protected void setUp() throws Exception
{
- Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config.setFetchInMemoryState(false);
config.setSyncCommitPhase(true);
- Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
+ Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC);
config2.setFetchInMemoryState(false);
config2.setSyncCommitPhase(true);
cache = PojoCacheFactory.createCache(config, false);
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -22,23 +22,14 @@
package org.jboss.cache.pojo.optimistic;
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
import org.jboss.cache.Fqn;
import org.jboss.cache.commands.VersionedDataCommand;
import org.jboss.cache.commands.legacy.ReversibleCommand;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.parsing.XmlConfigurationParser;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.loader.DummyInMemoryCacheLoader;
-import org.jboss.cache.loader.DummySharedInMemoryCacheLoader;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
+import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader;
+import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.optimistic.DefaultDataVersion;
@@ -48,8 +39,14 @@
import org.jboss.cache.transaction.DummyTransactionManager;
import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.AfterMethod;
-import org.w3c.dom.Element;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
/**
* Base test for optimistic locking. Copied from Cache counterpart.
*/
@@ -124,7 +121,7 @@
protected CacheLoaderConfig getCacheLoaderConfig(boolean shared, boolean passivation) throws Exception
{
String cacheLoaderClass = shared ? DummySharedInMemoryCacheLoader.class.getName() : DummyInMemoryCacheLoader.class.getName();
- return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, "", false, (!shared), shared, false, false);
+ return UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, "", false, (!shared), shared, false, false);
}
protected PojoCache createCacheWithLoader(boolean passivationEnabled) throws Exception
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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -16,7 +16,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.Person;
@@ -43,10 +43,10 @@
{
log.info("setUp() ....");
boolean toStart = false;
- cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache.start();
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.getCache().getConfiguration().setSyncCommitPhase(true);
cache1.start();
cache.getCache().getRegion(Fqn.fromString("SESSION"), true);
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 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
@@ -55,10 +55,10 @@
{
log.info("setUp() ....");
boolean toStart = false;
- cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache.getCache().getConfiguration().setSyncCommitPhase(true);
cache.start();
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.getCache().getConfiguration().setSyncCommitPhase(true);
cache1.start();
Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java
===================================================================
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942)
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.test.Person;
@@ -75,12 +75,12 @@
public void testSimple() throws Exception
{
boolean toStart = true;
- cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
Person ben = createPerson("/person/test1", "Ben Wang", 40);
//System.out.println("\n*** I ***");
//System.out.println(((CacheImpl<Object, Object>) cache.getCache()).printDetails());
- cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+ cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
cache1.start();
//System.out.println("\n*** II ***");
15 years, 9 months
JBoss Cache SVN: r7941 - pojo/trunk.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-03-25 10:52:29 -0400 (Wed, 25 Mar 2009)
New Revision: 7941
Modified:
pojo/trunk/pom.xml
Log:
Modified: pojo/trunk/pom.xml
===================================================================
--- pojo/trunk/pom.xml 2009-03-25 12:07:49 UTC (rev 7940)
+++ pojo/trunk/pom.xml 2009-03-25 14:52:29 UTC (rev 7941)
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-pojo-version>3.0.0.CR3</jbosscache-pojo-version>
- <jbosscache-core-version>3.0.1.GA</jbosscache-core-version>
+ <jbosscache-pojo-version>3.1.0-SNAPSHOT</jbosscache-pojo-version>
+ <jbosscache-core-version>3.1.0.BETA2</jbosscache-core-version>
<jboss.aop.version>2.0.0.GA</jboss.aop.version>
</properties>
<parent>
15 years, 9 months
JBoss Cache SVN: r7940 - in core/tags/3.1.0.BETA2: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-03-25 08:07:49 -0400 (Wed, 25 Mar 2009)
New Revision: 7940
Modified:
core/tags/3.1.0.BETA2/pom.xml
core/tags/3.1.0.BETA2/src/main/java/org/jboss/cache/Version.java
Log:
JBoss Cache Release Script: Updating 3.1.0.BETA2
Modified: core/tags/3.1.0.BETA2/pom.xml
===================================================================
--- core/tags/3.1.0.BETA2/pom.xml 2009-03-25 12:07:23 UTC (rev 7939)
+++ core/tags/3.1.0.BETA2/pom.xml 2009-03-25 12:07:49 UTC (rev 7940)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.1.0-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>3.1.0.BETA2</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
@@ -472,7 +472,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jbosscache-core-version>3.0.3-SNAPSHOT-JBossAS</jbosscache-core-version>
+ <jbosscache-core-version>3.1.0.BETA2-JBossAS</jbosscache-core-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
<protocol.stack>tcp</protocol.stack>
</properties>
Modified: core/tags/3.1.0.BETA2/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/tags/3.1.0.BETA2/src/main/java/org/jboss/cache/Version.java 2009-03-25 12:07:23 UTC (rev 7939)
+++ core/tags/3.1.0.BETA2/src/main/java/org/jboss/cache/Version.java 2009-03-25 12:07:49 UTC (rev 7940)
@@ -32,10 +32,10 @@
@Immutable
public class Version
{
- public static final String version = "3.1.0-SNAPSHOT";
+ public static final String version = "3.1.0.BETA2";
public static final String codename = "Cascabel";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0', '3', '1', '0', 'S'};
+ static final byte[] version_id = {'0','3','1','0','B','E','T','A','2'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
15 years, 9 months
JBoss Cache SVN: r7939 - core/tags.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-03-25 08:07:23 -0400 (Wed, 25 Mar 2009)
New Revision: 7939
Added:
core/tags/3.1.0.BETA2/
Log:
JBoss Cache Release Script: Tagging 3.1.0.BETA2
Copied: core/tags/3.1.0.BETA2 (from rev 7938, core/trunk)
15 years, 9 months
JBoss Cache SVN: r7938 - in core/trunk/src: main/java/org/jboss/cache/config/parsing and 4 other directories.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-03-25 06:26:37 -0400 (Wed, 25 Mar 2009)
New Revision: 7938
Added:
core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java
Removed:
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/JGroupsStackParser.java
Modified:
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java
core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java
Log:
Moved JGroupsStackParser back to its old place
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2009-03-23 16:40:35 UTC (rev 7937)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -23,7 +23,7 @@
import org.jboss.cache.Version;
import org.jboss.cache.buddyreplication.BuddyManager;
-import org.jboss.cache.config.parsing.element.JGroupsStackParser;
+import org.jboss.cache.config.parsing.JGroupsStackParser;
import org.jboss.cache.factories.annotations.NonVolatile;
import org.jboss.cache.factories.annotations.Start;
import org.jboss.cache.lock.IsolationLevel;
Copied: core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java (from rev 7937, core/trunk/src/main/java/org/jboss/cache/config/parsing/element/JGroupsStackParser.java)
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.cache.config.parsing;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+
+/**
+ * The purpose of this class is to parse the jgroups configuration from the config file into an compact string
+ * that can be passed as a config to the channel.
+ *
+ * @author Mircea.Markus(a)jboss.com
+ * @since 3.0
+ */
+public class JGroupsStackParser
+{
+ // *****************
+ // NOTE: DO NOT MOVE THIS CLASS. In r7769 (http://lists.jboss.org/pipermail/jbosscache-commits/2009-February/005353....)
+ // I moved this to the element subpackage to sit alongside other parsers, as would be logical, but this broke
+ // POJO Cache since POJO Cache releases expect this class to be in this package. - Manik Surtani (March 2009)
+ // *****************
+
+ /**
+ * Parses the cluster config which is used to start a JGroups channel
+ *
+ * @param config an old-style JGroups protocol config String
+ */
+ public String parseClusterConfigXml(Element config)
+ {
+ StringBuilder buffer = new StringBuilder();
+ NodeList stack = config.getChildNodes();
+ int length = stack.getLength();
+
+ for (int s = 0; s < length; s++)
+ {
+ org.w3c.dom.Node node = stack.item(s);
+ if (node.getNodeType() != org.w3c.dom.Node.ELEMENT_NODE)
+ {
+ continue;
+ }
+
+ // Ignore Namespace until JGroups defines one
+ Element tag = (Element) node;
+ String protocol = tag.getLocalName();
+ if (protocol == null)
+ {
+ protocol = tag.getNodeName(); // try a non-namespace aware version
+ }
+ buffer.append(protocol);
+ processAttributes(buffer, tag);
+ buffer.append(':');
+ }
+ if (buffer.length() > 0)
+ {
+ //Remove the trailing ':'
+ buffer.setLength(buffer.length() - 1);
+ }
+ return buffer.toString();
+ }
+
+ private void processAttributes(StringBuilder buffer, Element tag)
+ {
+ NamedNodeMap attrs = tag.getAttributes();
+ int attrLength = attrs.getLength();
+ if (attrLength > 0)
+ {
+ buffer.append('(');
+ }
+ for (int a = 0; a < attrLength; a++)
+ {
+ Attr attr = (Attr) attrs.item(a);
+ processSingleAttribute(buffer, attr);
+ if (a < attrLength - 1)
+ {
+ buffer.append(';');
+ }
+ }
+ if (attrLength > 0)
+ {
+ buffer.append(')');
+ }
+ }
+
+ private void processSingleAttribute(StringBuilder buffer, Attr attr)
+ {
+ String name = attr.getName();
+ String value = attr.getValue();
+ buffer.append(name);
+ buffer.append('=');
+ buffer.append(value);
+ }
+}
Property changes on: core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2009-03-23 16:40:35 UTC (rev 7937)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -31,7 +31,7 @@
import org.jboss.cache.config.parsing.element.CustomInterceptorsElementParser;
import org.jboss.cache.config.parsing.element.EvictionElementParser;
import org.jboss.cache.config.parsing.element.LoadersElementParser;
-import org.jboss.cache.config.parsing.element.JGroupsStackParser;
+import org.jboss.cache.config.parsing.JGroupsStackParser;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.util.FileLookup;
import org.w3c.dom.Element;
Deleted: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/JGroupsStackParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/JGroupsStackParser.java 2009-03-23 16:40:35 UTC (rev 7937)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/JGroupsStackParser.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.cache.config.parsing.element;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-
-/**
- * The purpose of this class is to parse the jgroups configuration from the config file into an compact string
- * that can be passed as a config to the channel.
- *
- * @author Mircea.Markus(a)jboss.com
- * @since 3.0
- */
-public class JGroupsStackParser
-{
- /**
- * Parses the cluster config which is used to start a JGroups channel
- *
- * @param config an old-style JGroups protocol config String
- */
- public String parseClusterConfigXml(Element config)
- {
- StringBuilder buffer = new StringBuilder();
- NodeList stack = config.getChildNodes();
- int length = stack.getLength();
-
- for (int s = 0; s < length; s++)
- {
- org.w3c.dom.Node node = stack.item(s);
- if (node.getNodeType() != org.w3c.dom.Node.ELEMENT_NODE)
- {
- continue;
- }
-
- // Ignore Namespace until JGroups defines one
- Element tag = (Element) node;
- String protocol = tag.getLocalName();
- if (protocol == null)
- {
- protocol = tag.getNodeName(); // try a non-namespace aware version
- }
- buffer.append(protocol);
- processAttributes(buffer, tag);
- buffer.append(':');
- }
- if (buffer.length() > 0)
- {
- //Remove the trailing ':'
- buffer.setLength(buffer.length() - 1);
- }
- return buffer.toString();
- }
-
- private void processAttributes(StringBuilder buffer, Element tag)
- {
- NamedNodeMap attrs = tag.getAttributes();
- int attrLength = attrs.getLength();
- if (attrLength > 0)
- {
- buffer.append('(');
- }
- for (int a = 0; a < attrLength; a++)
- {
- Attr attr = (Attr) attrs.item(a);
- processSingleAttribute(buffer, attr);
- if (a < attrLength - 1)
- {
- buffer.append(';');
- }
- }
- if (attrLength > 0)
- {
- buffer.append(')');
- }
- }
-
- private void processSingleAttribute(StringBuilder buffer, Attr attr)
- {
- String name = attr.getName();
- String value = attr.getValue();
- buffer.append(name);
- buffer.append('=');
- buffer.append(value);
- }
-}
Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java 2009-03-23 16:40:35 UTC (rev 7937)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -36,9 +36,8 @@
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.LegacyConfigurationException;
import org.jboss.cache.config.RuntimeConfig;
-import org.jboss.cache.config.parsing.element.JGroupsStackParser;
+import org.jboss.cache.config.parsing.JGroupsStackParser;
import org.jboss.cache.config.parsing.XmlConfigurationParser2x;
-import org.jboss.cache.config.parsing.RootElementBuilder;
import org.jboss.cache.config.parsing.element.BuddyElementParser;
import org.jboss.cache.config.parsing.element.EvictionElementParser;
import org.jboss.cache.config.parsing.element.LoadersElementParser;
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java 2009-03-23 16:40:35 UTC (rev 7937)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -2,10 +2,10 @@
import org.testng.annotations.Test;
import org.w3c.dom.Element;
-import org.jboss.cache.config.parsing.element.JGroupsStackParser;
+import org.jboss.cache.config.parsing.JGroupsStackParser;
/**
- * Tester class for {@link org.jboss.cache.config.parsing.element.JGroupsStackParser}
+ * Tester class for {@link JGroupsStackParser}
*
* @author Mircea.Markus(a)jboss.com
* @since 3.0
Modified: core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java 2009-03-23 16:40:35 UTC (rev 7937)
+++ core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java 2009-03-25 10:26:37 UTC (rev 7938)
@@ -3,7 +3,7 @@
import org.jboss.cache.Cache;
import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.parsing.element.JGroupsStackParser;
+import org.jboss.cache.config.parsing.JGroupsStackParser;
import org.jboss.cache.config.parsing.XmlConfigHelper;
import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.TestingUtil;
15 years, 9 months