mcardle 2005/10/09 10:48:02 CEST
Modified files:
core/src/java/org/jahia/services/esi EsiInvalidation.java
EsiService.java
Log:
* optimized Invalidation messages using StringBuffers
Revision Changes Path
1.7 +19 -20
jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java.diff?r1=1.6&r2=1.7&f=h
1.12 +3 -3
jahia/core/src/java/org/jahia/services/esi/EsiService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/esi/EsiService.java.diff?r1=1.11&r2=1.12&f=h
Index: EsiService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/EsiService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EsiService.java 7 Oct 2005 14:59:57 -0000 1.11
+++ EsiService.java 9 Oct 2005 08:48:01 -0000 1.12
@@ -215,9 +215,9 @@
return result.toString();
}
- private final int CTN = 0;
- private final int CTNLIST = 1;
- private final int FIELD = 2;
+ protected final int CTN = 0;
+ protected final int CTNLIST = 1;
+ protected final int FIELD = 2;
/**
* add a Container reference to the current JesiObject at the top of the
Stack
Index: EsiInvalidation.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/esi/EsiInvalidation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EsiInvalidation.java 7 Oct 2005 14:59:57 -0000 1.6
+++ EsiInvalidation.java 9 Oct 2005 08:48:01 -0000 1.7
@@ -115,13 +115,14 @@
for (int i = 0; i < hosts.length; i++) {
str.append("<OBJECT> \n");
- str.append("<ADVANCEDSELECTOR URIPREFIX=\"" + uriPrefix + "/\"
HOST=\"" + hosts[i] + ":"+ports[i]+ "\"" );
+ str.append("<ADVANCEDSELECTOR
URIPREFIX=\"").append(uriPrefix).append("/\" HOST=\"")
+
.append(hosts[i]).append(":").append(ports[i]).append("\"");
//make sure this is a fragment i.e. it contains "__esi_fragment"
- str.append( " URIEXP=\"/pid/"+pid+"\\?__esi_fragment=" + fragID
+"\" > \n");
+ str.append( "
URIEXP=\"/pid/").append(pid).append("\\?__esi_fragment=").append(fragID).append("\"
> \n");
//str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\" VALUE=\"/pid/"
+ pid + "[^0-9]\"/> ");
str.append("</ADVANCEDSELECTOR> \n");
- str.append("<ACTION REMOVALTTL=\"" + removalTTL + "\" /> \n");
- str.append("<INFO
VALUE=\"remove-Fragment-on-PID-"+pid+"-FID-"+fragID+"\"/> \n");
+ str.append("<ACTION
REMOVALTTL=\"").append(removalTTL).append("\" /> \n");
+ str.append("<INFO
VALUE=\"remove-Fragment-on-PID-").append(pid).append("-FID-").append(fragID).append("\"/>
\n");
str.append("</OBJECT> \n");
}
return str.toString();
@@ -185,27 +186,27 @@
for (int i = 0; i < hosts.length; i++) {
str.append("<OBJECT> \n");
- str.append("<ADVANCEDSELECTOR URIPREFIX=\""+uriPrefix+"/\"
HOST=\"" + hosts[i] + ":"+ports[i]+"\" > \n");
- str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\"
VALUE=\"/pid/"+pid+"$\"/> \n");
+ str.append("<ADVANCEDSELECTOR
URIPREFIX=\"").append(uriPrefix).append("/\"
HOST=\"").append(hosts[i]).append(":").append(ports[i]).append("\" > \n");
+ str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\"
VALUE=\"/pid/").append(pid).append("$\"/> \n");
str.append("</ADVANCEDSELECTOR> \n");
- str.append("<ACTION REMOVALTTL=\""+removalTTL+"\" /> \n");
- str.append("<INFO
VALUE=\"remove-Template-on-PID-"+pid+"-InvType_1of3\"/> \n");
+ str.append("<ACTION
REMOVALTTL=\"").append(removalTTL).append("\" /> \n");
+ str.append("<INFO
VALUE=\"remove-Template-on-PID-").append(pid).append("-InvType_1of3\"/> \n");
str.append("</OBJECT> \n");
str.append("<OBJECT> \n");
- str.append("<ADVANCEDSELECTOR URIPREFIX=\""+uriPrefix+"/\"
HOST=\"" + hosts[i] + ":"+ports[i]+"\" > \n");
- str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\"
VALUE=\"/pid/"+pid+"/$\"/> \n");
+ str.append("<ADVANCEDSELECTOR
URIPREFIX=\"").append(uriPrefix).append("/\"
HOST=\"").append(hosts[i]).append(":").append(ports[i]+"\" > \n");
+ str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\"
VALUE=\"/pid/").append(pid).append("/$\"/> \n");
str.append("</ADVANCEDSELECTOR> \n");
- str.append("<ACTION REMOVALTTL=\""+removalTTL+"\" /> \n");
- str.append("<INFO
VALUE=\"remove-Template-on-PID-"+pid+"-InvType_2of3\"/> \n");
+ str.append("<ACTION
REMOVALTTL=\"").append(removalTTL).append("\" /> \n");
+ str.append("<INFO
VALUE=\"remove-Template-on-PID-").append(pid).append("-InvType_2of3\"/> \n");
str.append("</OBJECT> \n");
str.append("<OBJECT> \n");
- str.append("<ADVANCEDSELECTOR URIPREFIX=\""+uriPrefix+"/\"
HOST=\"" + hosts[i] + ":"+ports[i]+"\" > \n");
- str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\"
VALUE=\"/pid/"+pid+"\\?[^_]\"/> \n");
+ str.append("<ADVANCEDSELECTOR
URIPREFIX=\"").append(uriPrefix).append("/\" HOST=\"").append(hosts[i]
).append(":").append(ports[i]).append("\" > \n");
+ str.append("<OTHER NAME=\"URI\" TYPE=\"REGEX\"
VALUE=\"/pid/").append(pid).append("\\?[^_]\"/> \n");
str.append("</ADVANCEDSELECTOR> \n");
- str.append("<ACTION REMOVALTTL=\""+removalTTL+"\" /> \n");
- str.append("<INFO
VALUE=\"remove-Template-on-PID-"+pid+"-InvType_3of3\"/> \n");
+ str.append("<ACTION
REMOVALTTL=\"").append(removalTTL).append("\" /> \n");
+ str.append("<INFO
VALUE=\"remove-Template-on-PID-").append(pid).append("-InvType_3of3\"/> \n");
str.append("</OBJECT> \n");
}
return str.toString();
@@ -331,10 +332,8 @@
for (int i = 0; i < EsiServerIPs.length; i++) {
str.append("<OBJECT> \n");
- str.append("<ADVANCEDSELECTOR URIPREFIX=\"/\" HOST=\""
- + EsiServerIPs[i]
- + ":"
- + EsiServerPorts[i] +"\" > \n");
+ str.append("<ADVANCEDSELECTOR URIPREFIX=\"/\" HOST=\"")
+ .append(
EsiServerIPs[i]).append(":").append(EsiServerPorts[i] +"\" > \n");
str.append("</ADVANCEDSELECTOR> \n");
str.append("<ACTION REMOVALTTL=\"0\" /> \n");
str.append("<INFO VALUE=\"bootTime-remove-EVERYTHING\"/> \n");
