mcardle 2005/11/02 16:51:14 CET
Modified files:
WEB-INF/config data.xml
WEB-INF log4j.xml
. build.xml
Added files:
WEB-INF/classes WCSinvalidation.dtd
Log:
* support for SOAP invalidation
Revision Changes Path
1.1 +142 -0 esi_server/WEB-INF/classes/WCSinvalidation.dtd (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/WEB-INF/classes/WCSinvalidation.dtd?rev=1.1&content-type=text/plain
1.3 +18 -0 esi_server/WEB-INF/config/data.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/WEB-INF/config/data.xml.diff?r1=1.2&r2=1.3&f=h
1.2 +4 -0 esi_server/WEB-INF/log4j.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/WEB-INF/log4j.xml.diff?r1=1.1&r2=1.2&f=h
1.6 +2 -0 esi_server/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/build.xml.diff?r1=1.5&r2=1.6&f=h
Index: data.xml
===================================================================
RCS file: /home/cvs/repository/esi_server/WEB-INF/config/data.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- data.xml 25 Oct 2005 12:31:16 -0000 1.2
+++ data.xml 2 Nov 2005 15:51:13 -0000 1.3
@@ -1,6 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
+ <generalsettings>
+ <invalidationPort>6666</invalidationPort>
+ <activateInvalidationServer>true</activateInvalidationServer>
+
+ <enableCacheBypass> true </enableCacheBypass>
+ <enableCacheOffOnce>true </enableCacheOffOnce>
+
+ <enableESI>true</enableESI>
+
+ <maxCacheableBinarySize>true </maxCacheableBinarySize>
+ <maxHttpClientThreads>true </maxHttpClientThreads>
+
+ <connectionTimeout>8000</connectionTimeout>
+
+ <username>admin</username>
+ <password>password</password>
+
+ </generalsettings>
<!--server className="net.sf.j2ep.servers.BaseServer"
domainName="www.nytimes.com"
isRewriting="true">
Index: log4j.xml
===================================================================
RCS file: /home/cvs/repository/esi_server/WEB-INF/log4j.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.xml 19 Oct 2005 17:30:27 -0000 1.1
+++ log4j.xml 2 Nov 2005 15:51:13 -0000 1.2
@@ -43,6 +43,10 @@
<priority value="debug"/>
</category>
+<category name="org.apache.commons.digester">
+ <priority value="info"/>
+</category>
+
<root>
<priority value="info"/>
<appender-ref ref="console"/>
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/esi_server/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 26 Oct 2005 13:45:21 -0000 1.5
+++ build.xml 2 Nov 2005 15:51:13 -0000 1.6
@@ -415,6 +415,7 @@
<mkdir dir="${build.home}"/>
<mkdir dir="${reports.test}"/>
<mkdir dir="${catalina.targetapp}/config"/>
+ <mkdir dir="${catalina.targetapp}/classes"/>
<!-- Copy external dependencies as required -->
<mkdir dir="${external.libs}"/>
@@ -440,6 +441,7 @@
<copy todir="${catalina.targetapp}" file="${app.home}/web.xml"/>
<copy todir="${catalina.targetapp}" file="${app.home}/log4j.xml"/>
<copy todir="${catalina.targetapp}/config"
file="${app.home}/config/data.xml"/>
+ <copy todir="${catalina.targetapp}/classes"
file="${app.home}/classes/WCSinvalidation.dtd"/>
<!-- Define the Cactus tasks -->
<taskdef resource="cactus.tasks" classpathref="compile.classpath" />
Index: WCSinvalidation.dtd
====================================================================
<!-- root element for invalidation request -->
<!ELEMENT INVALIDATION (SYSTEM?,OBJECT+)>
<!-- VERSION is currently "WCS-1.0" without the quotes -->
<!ATTLIST INVALIDATION
VERSION CDATA #REQUIRED
>
<!ELEMENT SYSTEM (SYSTEMINFO+)>
<!ELEMENT SYSTEMINFO EMPTY>
<!ATTLIST SYSTEMINFO
NAME CDATA #REQUIRED
VALUE CDATA #IMPLIED
>
<!ELEMENT OBJECT ((BASICSELECTOR|ADVANCEDSELECTOR),ACTION,INFO?)>
<!ELEMENT BASICSELECTOR EMPTY>
<!ATTLIST BASICSELECTOR
URI CDATA #REQUIRED
>
<!ELEMENT ADVANCEDSELECTOR (COOKIE|HEADER|OTHER)*>
<!ATTLIST ADVANCEDSELECTOR
URIPREFIX CDATA #REQUIRED
HOST CDATA #IMPLIED
URIEXP CDATA #IMPLIED
METHOD CDATA #IMPLIED
BODYEXP CDATA #IMPLIED
>
<!ELEMENT COOKIE EMPTY>
<!ATTLIST COOKIE
NAME CDATA #REQUIRED
VALUE CDATA #IMPLIED
>
<!ELEMENT HEADER EMPTY>
<!ATTLIST HEADER
NAME CDATA #REQUIRED
VALUE CDATA #IMPLIED
>
<!ELEMENT OTHER EMPTY>
<!ATTLIST OTHER
TYPE CDATA "SUBSTRING"
NAME CDATA #REQUIRED
VALUE CDATA #IMPLIED
>
<!ELEMENT ACTION EMPTY>
<!ATTLIST ACTION
REMOVALTTL CDATA #IMPLIED
>
<!-- root element for invalidation result -->
<!ELEMENT INVALIDATIONRESULT (SYSTEM?, OBJECTRESULT+)>
<!-- VERSION is currently "WCS-1.0" without the quotes -->
<!ATTLIST INVALIDATIONRESULT
VERSION CDATA #IMPLIED
>
<!ELEMENT OBJECTRESULT ((BASICSELECTOR|ADVANCEDSELECTOR), RESULT,
INFO?)>
<!ELEMENT RESULT EMPTY>
<!ATTLIST RESULT
ID CDATA #REQUIRED
STATUS CDATA #REQUIRED
NUMINV CDATA #REQUIRED
>
<!-- below is oracle's extension to WCSinvalidation.dtd -->
<!-- possible VERSION can be
"WCS-1.0": ESI, web cache 2.0.0.1, or
"WCS-1.1": ESI, plus HCD
-->
<!--
possible SYSTEMINFO's:
NAME = WCS_SENDER_TYPE, VALUE = USER | COORDINATOR
Default value for WCS_SENDER_TYPE is USER.
NAME = WCS_PROPAGATE, VALUE = TRUE | FALSE
Default value for WCS_PROPAGATE is FALSE.
NAME = WCS_CACHE_NAME, VALUE = string
For print-friendly name of a cache node
NAME = WCS_NUM_OBJECT, VALUE = number
For total number of invalidation object on a cache node
NAME = WCS_HCD_ERROR, VALUE = string
For error message, when invalidation result is mixture
of success and failure for the cluster caches
NAME = WCS_DISCONNECTED_MODE_OK, VALUE = TRUE | FALSE
Release connection before invalidation; default is FALSE.
NAME = WCS_FORCE_CHUNKING, VALUE = TRUE | FALSE
For testing purposes only; default is FALSE.
-->
<!-- root element for invalidation result in DETAIL view -->
<!ELEMENT INVALIDATIONRESULTDETAIL (SYSTEM?,INVALIDATIONRESULT*)>
<!-- VERSION is currently "WCS-1.1" without the quotes -->
<!ATTLIST INVALIDATIONRESULTDETAIL
VERSION CDATA #REQUIRED
>
<!-- root element for invalidation preview request -->
<!ELEMENT INVALIDATIONPREVIEW (SYSTEM?, (BASICSELECTOR|ADVANCEDSELECTOR))>
<!-- VERSION is currently "WCS-1.1" without the quotes -->
<!ATTLIST INVALIDATIONPREVIEW
VERSION CDATA #REQUIRED
STARTNUM CDATA #REQUIRED
MAXNUM CDATA #REQUIRED
>
<!-- root element for invalidation preview result -->
<!ELEMENT INVALIDATIONPREVIEWRESULT (SYSTEM?, SELECTEDURL*)>
<!ATTLIST INVALIDATIONPREVIEWRESULT
VERSION CDATA #REQUIRED
STATUS CDATA #REQUIRED
STARTNUM CDATA #REQUIRED
NUMURLS CDATA #REQUIRED
TOTALNUMURLS CDATA #REQUIRED
>
<!ELEMENT SELECTEDURL EMPTY>
<!ATTLIST SELECTEDURL VALUE CDATA #REQUIRED>
<!ELEMENT INFO EMPTY>
<!ATTLIST INFO VALUE CDATA #REQUIRED>
