Author: cmailleux
Date: Mon Jun 18 14:39:20 2007
New Revision: 398
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D398&repname=
=3Desi_server
Log:
Put only one tag per line
Modified:
trunk/WEB-INF/config/data.xml
Modified: trunk/WEB-INF/config/data.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/WEB-INF/config/=
data.xml&rev=3D398&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/WEB-INF/config/data.xml (original)
+++ trunk/WEB-INF/config/data.xml Mon Jun 18 14:39:20 2007
@@ -142,8 +142,10 @@
<!-- the following section declares rules which if matched will no=
t be cached, not generate a cache entry,
nor will it be parsed for ESI tags for the matching requests : -->
<default-passthrough-rules>
- <!-- activate passthrough for pages in EDIT mode --><!--passth=
rough-rule className=3D"net.sf.j2ep.rules.UrlRule" type=3D"SUBSTRING"
- url=3D"/op/edit/" description=3D"EDIT mo=
de passthrough"/--><!-- activate passthrough for files already compressed -=
->
+ <!-- activate passthrough for pages in EDIT mode -->
+ <!--passthrough-rule className=3D"net.sf.j2ep.rules.UrlRule" t=
ype=3D"SUBSTRING"
+ url=3D"/op/edit/" description=3D"EDIT mo=
de passthrough"/-->
+ <!-- activate passthrough for files already compressed -->
<passthrough-rule className=3D"net.sf.j2ep.rules.UrlRule"
type=3D"SUBSTRING"
url=3D".zgz"
@@ -216,7 +218,7 @@
<passthrough-rule className=3D"net.sf.j2ep.rules.UrlRule"
type=3D"REGEX"
url=3D"(\.css|\.html|\.htm|\.png|\.jpg|\=
.jpeg|\.gif)$"
- description=3D"want to cache some type o=
f files if thir size is below maximumSizeOfCacheableBinaryContent"/>
+ description=3D"want to cache some type o=
f files if their size is below maximumSizeOfCacheableBinaryContent"/>
</passthrough-composite-rule>
</default-passthrough-rules>
<!-- =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=3D -->
@@ -323,10 +325,10 @@
<requestThrottleMaxParallelRequests>1</requestThrottleMaxParallelR=
equests>
<!-- the minimum amount of time a request should be stalled -at ea=
ch wait loop iteration- before we can check again if
it is now in cache or if a slot has freed up in the throttler=
. (in Milliseconds) -->
- <requestThrottleMinWait>500</requestThrottleMinWait>
+ <requestThrottleMinWait>100</requestThrottleMinWait>
<!-- the maximum amount of time a request should be stalled -at ea=
ch wait loop iteration- before we can check again if
it is now in cache or if a slot has freed up in the throttler=
. (in Milliseconds) -->
- <requestThrottleMaxWait>4000</requestThrottleMaxWait>
+ <requestThrottleMaxWait>2000</requestThrottleMaxWait>
<!-- enable template caching -->
<enableTemplateCaching>true</enableTemplateCaching>
<!-- name of esi cookie (should be identical to esiCookieCookieNam=
e in jahia.properties) -->
@@ -381,7 +383,9 @@
<cacheJanitorMinFreeMemory>50</cacheJanitorMinFreeMemory>
<!-- MaxHeapSize is the maximum size (in MB)that can be used by th=
e server.
It is recommended to have heapsize equal to the JVM's -Xmx pa=
rameter (for example -Xmx200M)
- The default value is set to the value used in the -Xmx parame=
ter --><!-- cacheJanitorMaxHeapSize>256</cacheJanitorMaxHeapSize--><!-- The=
cleanupthreadinterval defines the interval (in seconds) of the background =
thread which checks memory. -->
+ The default value is set to the value used in the -Xmx parame=
ter -->
+ <!-- cacheJanitorMaxHeapSize>256</cacheJanitorMaxHeapSize-->
+ <!-- The cleanupthreadinterval defines the interval (in seconds) o=
f the background thread which checks memory. -->
<cacheJanitorThreadInterval>5</cacheJanitorThreadInterval>
<!-- number of cache objects to delete/check for deletion at each =
iteration -->
<cacheJanitorMaxbatchSize>30</cacheJanitorMaxbatchSize>
@@ -444,15 +448,16 @@
requests are not forwarded to it. The following parameter sets the=
the polling time (in MilliSeconds)
which decides how long we wait between doing checks: -->
<clusterPollingIntervalinMS>300000</clusterPollingIntervalinMS>
- <!-- where 300000 ms =3D 5*60*1000 ms =3D 5 minutes --><!-- In cl=
ustered mode, the ESI server returns the next available online server. Howe=
ver,
+ <!-- where 300000 ms =3D 5*60*1000 ms =3D 5 minutes -->
+ <!-- In clustered mode, the ESI server returns the next available=
online server. However,
if all servers are down, it will wait indefinitely until a server =
comes back online.
This settings gives it a time-out instead after which it will retu=
rn an error to the client
request if no server could be found in the allocated time : -->
<clusterTimeOutinMS>20000</clusterTimeOutinMS>
- <!-- where 20000 ms =3D 20*1000 ms =3D 20 secs --><!-- determine i=
f the access/modification stats for each cache entry is calculated or not -=
->
+ <!-- where 20000 ms =3D 20*1000 ms =3D 20 secs -->
+ <!-- determine if the access/modification stats for each cache ent=
ry is calculated or not -->
<calculateStats>false</calculateStats>
- <!-- for debug purposes: append cachekey used to fetch template/fr=
agments in the cache in the
- generated HTML -->
+ <!-- for debug purposes: append cachekey used to fetch template/fr=
agments in the cache in the generated HTML -->
<addCacheKeyDebugInfo>false</addCacheKeyDebugInfo>
<!-- substring in request URLs identifying a WebDav command -->
<webDavUrlMarker>/webdav/</webDavUrlMarker>
@@ -460,7 +465,9 @@
<enableESI>true</enableESI>
<!-- currently unused -->
<invalidationPortRange>6766-6866</invalidationPortRange>
- <!-- *************************************************************=
****************************** --><!-- *************** END: For Advanced U=
sers only ******************************************* --><!-- *********=
***************************************************************************=
******* -->
+ <!-- *************************************************************=
****************************** -->
+ <!-- *************** END: For Advanced Users only *************=
****************************** -->
+ <!-- *************************************************************=
****************************** -->
</generalsettings>
<!-- The example server entry below dictactes that all request with a =
/news in their request URL
will be forwarded to the nytimes.com website. See http://j2ep.sourcefo=
rge.net/docs/configuration.html
@@ -471,44 +478,53 @@
<rule className=3D"net.sf.j2ep.rules.DirectoryRule"
directory=3D"/news"
/>
- </server--><!-- The example below declares two remote servers. Client
req=
uests are dispatched to
+ </server-->
+ <!-- The example below declares two remote servers. Client requests ar=
e dispatched to
each server in a round-robin fashion (use RandomCluster for random dis=
patching).
Every 5 mins each server is checked for availability;
if no response is recieved it is removed from the available server lis=
t until it is detected
- back online --><!--cluster-server className=3D"net.sf.j2ep.servers.Rou=
ndRobinCluster" isRewriting=3D"false" id=3D"myCluster1" usingVirtualHost=3D=
"true" >
+ back online -->
+ <!--cluster-server className=3D"net.sf.j2ep.servers.RoundRobinCluster"=
isRewriting=3D"false" id=3D"myCluster1" usingVirtualHost=3D"true" >
<server domainName=3D"192.168.2.129:8080" /> (=3Dsecond server)
<server domainName=3D"192.168.2.194:8080" /> (=3Dfirst server)
<rule className=3D"net.sf.j2ep.rules.AcceptEverythingRule" descri=
ption=3D"catch all"/>
- </cluster-server--><!-- The example below declares two remote servers =
in a Fail-Over configuration.
+ </cluster-server-->
+ <!-- The example below declares two remote servers in a Fail-Over conf=
iguration.
Client requests are dispatched to the first server until it detects it=
as unavailable.
If it is detected as unavailable, it will try to dispatch requests to =
the next available server
down the list. Once the first server goes back online, it will revert =
back to it.
Therefore, the server entry ordering in this config is critical.
- --><!--cluster-server className=3D"net.sf.j2ep.servers.FailOverCluster=
" isRewriting=3D"false" id=3D"myCluster2" usingVirtualHost=3D"true">
+ -->
+ <!--cluster-server className=3D"net.sf.j2ep.servers.FailOverCluster" i=
sRewriting=3D"false" id=3D"myCluster2" usingVirtualHost=3D"true">
<server domainName=3D"192.168.2.129:8080" /> (=3Dsecond server)
<server domainName=3D"192.168.2.194:8080" /> (=3Dfirst server)
<rule className=3D"net.sf.j2ep.rules.AcceptEverythingRule" descri=
ption=3D"catch all"/>
- </cluster-server--><!-- For each virtual site you create on Jahia, you=
must add a <server> entry; an example
+ </cluster-server-->
+ <!-- For each virtual site you create on Jahia, you must add a <server=
> entry; an example
of which is given below.
So for example, if you have declare the Jahia site internet1 with the
do=
main name internet1.com,
then you want client requests to http://internet1.com:8081/jahia/Jahia
t=
o be forwarded by the
- ESI server to http://internet1.com:8080/jahia/Jahia. This is achieved
by=
the example given below: --><!-- server className=3D"net.sf.j2ep.servers.B=
aseServer"
+ ESI server to http://internet1.com:8080/jahia/Jahia. This is achieved
by=
the example given below: -->
+ <!-- server className=3D"net.sf.j2ep.servers.BaseServer"
domainName=3D"internet1.com:8080"
isRewriting=3D"false"
usingVirtualHost=3D"true">
=
<rule className=3D"net.sf.j2ep.rules.HostRule"
hostname=3D"internet1.com=
" port=3D"8081" description=3D"my internet1 rule"/>
- </server--><!-- The example below is the same as for the internet1 site=
, but for a second site called internet2
+ </server-->
+ <!-- The example below is the same as for the internet1 site, but for =
a second site called internet2
which is on port 80. This means that http://internet2.com:80/jahi=
a/Jahia (as well as
http://internet2.com/jahia/Jahia, since 80 is the default port) w=
ill be forwarded by the
ESI server to http://internet2.com:8080/jahia/Jahia.
- --><!-- server className=3D"net.sf.j2ep.servers.BaseServer"
+ -->
+ <!-- server className=3D"net.sf.j2ep.servers.BaseServer"
domainName=3D"internet2.com:8080"
isRewriting=3D"false" id=3D"myServer3"
usingVirtualHost=3D"true">
=
<rule className=3D"net.sf.j2ep.rules.HostRule"
hostname=3D"internet2.com=
" port=3D"80" description=3D"my internet2 rule"/>
- </server--><!-- The order of the entries are significant since the firs=
t server (going from top to bottom) to match
+ </server-->
+ <!-- The order of the entries are significant since the first server (=
going from top to bottom) to match
the current request will be selected as the server to which all calls=
will be forwarded to.
The final entry below uses the Rule defined by net.sf.j2ep.rules.Acce=
ptEverythingRule, which
is always true so it catches everything. Note that you can put more t=
han one rule in each server,
@@ -520,9 +536,10 @@
the Jahia sitekey in the request url to remote Jahias in a clustered=
configuration. If usingVirtualHost=3Dfalse,
the hostname in the domainName attribute will be used only by the re=
mote Jahia server to decide
to which Jahia site to forward the request to.
- --><!-- Put the IP and port of your Jahia server in the domainName a=
ttribute below -->
+ -->
+ <!-- Put the IP and port of your Jahia server in the domainName attrib=
ute below -->
<server className=3D"net.sf.j2ep.servers.BaseServer"
- domainName=3D"localhost:8080"
+ domainName=3D"localhost:8080"
isRewriting=3D"false"
id=3D"myServer3"
usingVirtualHost=3D"true">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
