mcardle 2005/08/30 18:39:48 CEST
Modified files:
core/src/webapp/WEB-INF/etc/config jahia.skeleton
Log:
* added support for invalidation on a multi-IP/multi-port Esi server
* added support for automatic boot time cleanup of the ESI server cache
* added support to view referenced contentIDs in each fragment
* added support for invalidation via HTML piggybacking or SOAP (new default)
* some refactoring
Revision Changes Path
1.22 +19 -14 jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton.diff?r1=1.21&r2=1.22&f=h
Index: jahia.skeleton
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jahia.skeleton 25 Aug 2005 18:34:01 -0000 1.21
+++ jahia.skeleton 30 Aug 2005 16:39:47 -0000 1.22
@@ -151,29 +151,34 @@
# Note that the above conventional cache must be deactivated
# for ESI fragment caching to work
esiCacheActivated =
false
-esiServerIP
= localhost
-esiServerPort
= 7001
-esiInvalidationPort =
4000
esiCacheServerLogin =
admin
esiCacheServerPassword
= password
# Display an HTML fieldset box around fragment tags
# useful for debugging purposes only :
esiDisplayFragmentDelimiters = true
+# Used to display the referenced content IDs in each Template/Fragment
+esiDisplayContentIDs = false
# Should the cache of the remote ESI server (for the current Jahia instance
only)
# be cleared at boot time :
esiCleanupCacheAtBootTime =
true
-# In order to do carry out esiCleanupCacheAtBootTime, Jahia needs to know
the address(es)
-# of the current Jahia instance at boot time. For installations where the
same Jahia instance can be accessed
-# via multiple IPs or Ports, one can declare a ';' seperated list of
IP/server combinations,
+# In order to do carry out esiCleanupCacheAtBootTime and for other
invalidation purposes,
+# Jahia needs to know address(es) used to access one or more of the ESI
server instances at boot time.
+# (Note that these IPs/ports are only used to generate the appropriate cache
key entry for the ESI server)
+# You can declare a ';' seperated list of IP/server combinations
# e.g. :
-# jahiaServerIP = 192.168.2.178;192.168.4.2;80.2.201.100
-# jahiaServerPort = 8080;7080;80
-# which corresponds to addresses 192.168.2.178:8080, 192.168.4.2:7080 and
80.2.201.100:80
-
-# Jahia server IP(s)
-jahiaServerIP =
localhost
-# Jahia server Port(s)
-jahiaServerPort =
8080
+# esiServerIPs = 192.168.2.178;192.168.4.2;80.2.201.100
+# esiServerPorts = 8081;7079;80
+# which corresponds to addresses 192.168.2.178:8081, 192.168.4.2:7079 and
80.2.201.100:80
+esiServerIPs =
localhost
+esiServerPorts
= 7001
+# The IP/Port of the ESI server where all SOAP invalidation messages are
sent to
+esiInvalidationIP =
localhost
+esiInvalidationPort =
4000
+
+# ESI invalidation messages can be either send via HTML reponse
piggy-backing ( i.e.
+# they are appended to Jahia HTML responses) or via a direct SOAP
transmission to the ESI
+# server (default):
+esiUsePiggyBackInvalidation = false
### JMS Cache Settings ###############
