Author: cmailleux
Date: Tue Aug 28 10:56:55 2007
New Revision: 411
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D411&repname=
=3Desi_server
Log:
Remove Jboss cache specific code
Modified:
trunk/src/org/jahia/esi/Utils.java
trunk/src/org/jahia/esi/cache/CacheKeyGenerator.java
Modified: trunk/src/org/jahia/esi/Utils.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/e=
si/Utils.java&rev=3D411&repname=3Desi_server
=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
--- trunk/src/org/jahia/esi/Utils.java (original)
+++ trunk/src/org/jahia/esi/Utils.java Tue Aug 28 10:56:55 2007
@@ -147,26 +147,26 @@
else
offpart =3D "off";
=
- if (inKey && SettingsBean.getInstance().isClusterEsiCache()) {
- //since / is a reserved node seperator in TreeCache
-
- String cacheOffStr =3DCacheKeyGenerator.SLASH_ALTERNATIVE
- +"cache"
- +CacheKeyGenerator.SLASH_ALTERNATIVE
- +offpart;
- String tailingSlash =3D CacheKeyGenerator.SLASH_ALTERNATIVE;
- String replacementStr =3D CacheKeyGenerator.SLASH_ALTERNATIVE;
-
- return removeCacheParam(url, cacheOffStr, tailingSlash, replac=
ementStr);
- }
- else {
+// if (inKey && SettingsBean.getInstance().isClusterEsiCache()) {
+// //since / is a reserved node seperator in TreeCache
+//
+// String cacheOffStr =3DCacheKeyGenerator.SLASH_ALTERNATIVE
+// +"cache"
+// +CacheKeyGenerator.SLASH_ALTERNATIVE
+// +offpart;
+// String tailingSlash =3D CacheKeyGenerator.SLASH_ALTERNATIVE;
+// String replacementStr =3D CacheKeyGenerator.SLASH_ALTERNATIV=
E;
+//
+// return removeCacheParam(url, cacheOffStr, tailingSlash, repl=
acementStr);
+// }
+// else {
=
String cacheOffStr =3D "/cache/"+offpart;
String tailingSlash =3D "/";
String replacementStr =3D "/";
=
return removeCacheParam(url, cacheOffStr, tailingSlash, replac=
ementStr);
- }
+// }
}
=
private static String removeCacheParam(String input,
Modified: trunk/src/org/jahia/esi/cache/CacheKeyGenerator.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/e=
si/cache/CacheKeyGenerator.java&rev=3D411&repname=3Desi_server
=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
--- trunk/src/org/jahia/esi/cache/CacheKeyGenerator.java (original)
+++ trunk/src/org/jahia/esi/cache/CacheKeyGenerator.java Tue Aug 28 10:56:5=
5 2007
@@ -291,8 +291,8 @@
else
key =3D key.replaceFirst(Utils.quote(oldAdd),REMOTE_SERVER+ser=
verCtn.getId());
=
- if (SettingsBean.getInstance().isClusterEsiCache())
- key =3D key.replaceAll("/", CacheKeyGenerator.SLASH_ALTERNATIV=
E); //since / is a reserverd node seperator in TreeCache
+// if (SettingsBean.getInstance().isClusterEsiCache())
+// key =3D key.replaceAll("/", CacheKeyGenerator.SLASH_ALTERNAT=
IVE); //since / is a reserverd node seperator in TreeCache
return key;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
