Author: cmailleux
Date: Wed Jul 11 18:09:41 2007
New Revision: 17939
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17939&repname=
=3Djahia
Log:
Try to correct ESI-330 with new OPTIMISTIC LOCK from JBoss Cache 1.4.1 SP3
Actually using a DummyTransactionManager will see later to make that config=
urable
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/aop/EsiJspContentD=
etectionAspect.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi/EsiSe=
rvice.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/aop/EsiJspCo=
ntentDetectionAspect.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/aop/EsiJspContentDetectionAspect.java&rev=
=3D17939&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/aop/EsiJspContentD=
etectionAspect.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/aop/EsiJspContentD=
etectionAspect.java Wed Jul 11 18:09:41 2007
@@ -350,7 +350,7 @@
+ joinPoint.getCalleeClass().getName() + "::"
+ signature.getName() + "\n" + joinPoint.toString()
+ "Exception : "
- + ptrWriter.toString()
+ + strWriter.getBuffer().toString()
);
System.err.println("------- aspObj: "+ aspObj);
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi=
/EsiService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/esi/EsiService.java&rev=3D17939&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi/EsiSe=
rvice.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi/EsiSe=
rvice.java Wed Jul 11 18:09:41 2007
@@ -17,6 +17,7 @@
*/package org.jahia.services.esi;
=
import org.jahia.services.*;
+import org.jahia.services.cache.jboss.TomcatTransactionManagerLookup;
import org.jahia.services.esi.tagstack.Fragment;
import org.jahia.services.esi.tagstack.Template;
import org.jahia.services.esi.tagstack.JesiObject;
@@ -25,6 +26,8 @@
import org.jahia.services.usermanager.JahiaUser;
=
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
import org.jahia.bin.Jahia;
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.data.containers.JahiaContainer;
@@ -37,7 +40,6 @@
import org.jahia.taglibs.esi.JesiConst;
import org.jboss.cache.*;
import org.jboss.cache.lock.IsolationLevel;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
=
=
/**
@@ -135,15 +137,15 @@
=
try {
cache =3D new TreeCache();
- cache.setClusterName(clusterName);
- cache.setClusterProperties(clusterProperties);
+ cache.setNodeLockingScheme("OPTIMISTIC");
+ cache.setTransactionManagerLookup(new DummyTransactionManagerL=
ookup());
if (clusterActivated && Jahia.getSettings().isEsiCacheActivate=
d()) {
cache.setCacheMode(TreeCache.REPL_SYNC);
+ cache.setClusterName(clusterName);
+ cache.setClusterProperties(clusterProperties);
} else {
cache.setCacheMode(TreeCache.LOCAL);
}
- // the most important setting here is the isolation level.
- cache.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED ); //a=
vailable: NONE, READ_UNCOMMITTED, READ_COMMITTED, REPEATABLE_READ or SERIAL=
IZABLE
=
//PropertyConfigurator config =3D new PropertyConfigurator();
//config.configure(cache, "treecache-esi.xml");
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
