Author: bpapez
Date: Wed Aug 22 14:16:22 2007
New Revision: 18225
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18225&repname=
=3Djahia
Log:
Fix and improve error handling for error 503 (Service temporarily unavailab=
le)
- trigger automatic reloading of GET requests
- for POST requests or server overloaded on non-startup case, just add a ma=
nual refresh possiblity with a suggested time, when server will be up or av=
ailable again
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_de.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
trunk/core/src/conf/java/JahiaEnginesResources_it.properties
trunk/core/src/conf/java/JahiaMessageResources.properties
trunk/core/src/conf/java/JahiaMessageResources_de.properties
trunk/core/src/conf/java/JahiaMessageResources_en.properties
trunk/core/src/conf/java/JahiaMessageResources_fr.properties
trunk/core/src/conf/java/JahiaMessageResources_it.properties
trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java
trunk/core/src/java/org/jahia/operations/valves/EngineValve.java
trunk/core/src/webapp/jsp/jahia/errors/error_503.jsp
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Wed Aug 22 14=
:16:22 2007
@@ -566,8 +566,11 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
+org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D If this error oc=
curs again, please
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D click here to vi=
ew the html source
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D You should then =
find the detail of the error (stack trace). Copy it and send it to your sit=
e manager so that he can solve the problem. Sorry for the inconvenience
Modified: trunk/core/src/conf/java/JahiaEnginesResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_de.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaEnginesResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_de.properties Wed Aug 22=
14:16:22 2007
@@ -89,8 +89,11 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Abmelden
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Der Administrat=
or wurde per E-Mail benachrichtigt.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Seite nicht g=
efunden
+org.jahia.bin.JahiaErrorDisplay.retry.label =3D Wiederholen
+org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Bitte versuchen sie =
es in {0,choice,0#|1#1 Stunde |1<{0,number,integer} Stunden }{1,choice,0#|1=
#1 Minute |1<{1,number,integer} Minuten }{2,choice,0#|1#1 Sekunde|1<{2,numb=
er,integer} Sekunden} wieder.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Bitte versuchen sie e=
s zu einem sp\u00E4teren Zeitpunkt wieder.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Klicken Sie hier, =
um zu Jahia zur\u00FCckzukehren.
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia ist vor=
=C3=BCbergehend nicht verf\u00FCgbar. Bitte versuchen sie es zu einem sp\u0=
0E4teren Zeitpunkt wieder.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia ist vor=
=C3=BCbergehend nicht verf\u00FCgbar. =
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Sollte dieser Fe=
hler noch einmal auftreten,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D klicken Sie hier=
, um den HTML-Quellcode anzuzeigen.
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Sie sollten dann=
den Fehler erkennen k\u00F6nnen (Stack Trace). Kopieren Sie den Fehler und=
senden Sie ihn an den Administrator, damit dieser das Problem beheben kann=
. Wir bitten um Ihr Verst\u00E4ndnis.
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_en.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Wed Aug 22=
14:16:22 2007
@@ -566,8 +566,11 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
+org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D If this error oc=
curs again, please
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D click here to vi=
ew the html source
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D You should then =
find the detail of the error (stack trace). Copy it and send it to your sit=
e manager so that he can solve the problem. Sorry for the inconvenience
Modified: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_fr.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaEnginesResources_fr.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Wed Aug 22=
14:16:22 2007
@@ -140,8 +140,9 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Se d=C3=A9connecter
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Un e-mail de no=
tification a =C3=A9t=C3=A9 envoy=C3=A9 =C3=A0 l'administrateur.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page non trou=
v=C3=A9e
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Veuillez essayer plus=
tard.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Cliquez ici pour r=
evenir =C3=A0 Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Le service n'=
est plus disponible.<br>nbsp; Veuillez vous reconnecter.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Le service n'=
est plus disponible.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Si cette erreur =
se reproduit,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D cliquez ici pour=
afficher le code HTML source
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Vous trouverez l=
e d=C3=A9tail de l'erreur (stack trace). Copiez-le et envoyez-le gestionnai=
re de votre site pour qu'il puisse corriger ce probl=C3=A8me. Excusez-nous =
pour tout d=C3=A9sagr=C3=A9ment.
Modified: trunk/core/src/conf/java/JahiaEnginesResources_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_it.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaEnginesResources_it.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_it.properties Wed Aug 22=
14:16:22 2007
@@ -90,8 +90,9 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Disconnetti
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Un'e-mail di no=
tifica \u00E8 stata inviata all'amministratore.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Pagina non tr=
ovata.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Provare pi\u00F9 tard=
i.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Fare clic qui per =
tornare a Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Servizio non =
disponibile, riaccedere.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Servizio non =
disponibile.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Se questo errore=
si verifica nuovamente,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D fare clic qui pe=
r vedere l'origine html
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Dovresti adesso =
trovare il dettaglio dell'errore (stack trace). Copialo e mandalo al tuo si=
te manager affinch\u00E8 possa risolvere il problema. Scusa per l'inconveni=
ente
Modified: trunk/core/src/conf/java/JahiaMessageResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaMessageResources.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources.properties Wed Aug 22 14=
:16:22 2007
@@ -198,8 +198,11 @@
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D You must log in again
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
+org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Virtual site er=
ror : Site not found.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D A warning has occ=
ured during processing. Please contact the <br> administrator if you get th=
is message repeatedly.
=
Modified: trunk/core/src/conf/java/JahiaMessageResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_de.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaMessageResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_de.properties Wed Aug 22=
14:16:22 2007
@@ -197,8 +197,11 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Abmelden
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Der Administrat=
or wurde per E-Mail benachrichtigt.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Seite nicht g=
efunden
+org.jahia.bin.JahiaErrorDisplay.retry.label =3D Wiederholen
+org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Bitte versuchen sie =
es in {0,choice,0#|1#1 Stunde |1<{0,number,integer} Stunden }{1,choice,0#|1=
#1 Minute |1<{1,number,integer} Minuten }{2,choice,0#|1#1 Sekunde|1<{2,numb=
er,integer} Sekunden} wieder.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Bitte versuchen sie e=
s zu einem sp\u00E4teren Zeitpunkt wieder.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Klicken Sie hier, =
um zu Jahia zur=C3=BCckzukehren.
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia ist vor=
=C3=BCbergehend nicht verf\u00FCgbar. Bitte versuchen sie es zu einem sp\u0=
0E4teren Zeitpunkt wieder.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia ist vor=
=C3=BCbergehend nicht verf\u00FCgbar.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Fehler auf virt=
ueller Site: Die Site wurde nicht gefunden.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D Bei der Verarbeit=
ung wurde eine Warnmeldung ausgegeben. Kontaktieren Sie Ihren Administrator=
, wenn Sie diese Meldung h=C3=A4ufiger erhalten.
=
Modified: trunk/core/src/conf/java/JahiaMessageResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_en.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaMessageResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_en.properties Wed Aug 22=
14:16:22 2007
@@ -200,8 +200,11 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
+org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Virtual site er=
ror : Site not found.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D A warning has occ=
ured during processing. Please contact the <br> administrator if you get th=
is message repeatedly.
=
Modified: trunk/core/src/conf/java/JahiaMessageResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_fr.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaMessageResources_fr.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_fr.properties Wed Aug 22=
14:16:22 2007
@@ -203,8 +203,9 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Se d=C3=A9connecter
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Un e-mail de no=
tification a =C3=A9t=C3=A9 envoy=C3=A9 =C3=A0 l'administrateur.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page non trou=
v=C3=A9e
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Veuillez essayer plus=
tard.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Cliquez ici pour r=
evenir =C3=A0 Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Le service n'=
est plus disponible.<br>nbsp; Veuillez vous reconnecter.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Le service n'=
est plus disponible.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Erreur site vir=
tuel : site introuvable.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D Une alerte est su=
rvenue lors du traitement. Veuillez contacter<br>l'administrateur si ce mes=
sage appara=C3=AEt r=C3=A9guli=C3=A8rement.
org.jahia.configurationWizard.checkForTrue.label =3D (Cocher pour vrai)
Modified: trunk/core/src/conf/java/JahiaMessageResources_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_it.properties&rev=3D18225&repname=3Djahia
=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/core/src/conf/java/JahiaMessageResources_it.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_it.properties Wed Aug 22=
14:16:22 2007
@@ -196,8 +196,9 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Disconnetti
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Un'e-mail di no=
tifica =C3=A8 stata inviata all'amministratore.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Pagina non tr=
ovata.
+org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Provare pi\u00F9 tard=
i.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Fare clic qui per =
tornare a Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Servizio non =
disponibile, riaccedere.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Servizio non =
disponibile.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Errore di sito =
virtuale: sito non trovato.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D Un messaggio di a=
llerta =C3=A8 stato generato. Contatta l' <br> amministratore se ricevi anc=
ora questo messaggio.
=
Modified: trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaErrorDisplay.java&rev=3D18225&repname=3Djahia
=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/core/src/java/org/jahia/bin/JahiaErrorDisplay.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java Wed Aug 22 14:=
16:22 2007
@@ -28,7 +28,9 @@
* @version 1.0
*/
=
+import org.apache.commons.lang.time.FastDateFormat;
import org.jahia.exceptions.JahiaException;
+import org.jahia.exceptions.JahiaServerOverloadedException;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.cache.Cache;
import org.jahia.services.sites.JahiaSite;
@@ -86,6 +88,7 @@
=
private static Throwable lastMailedException =3D null;
private static int lastMailedExceptionOccurences =3D 0;
+ private static FastDateFormat df =3D FastDateFormat.getInstance("E, d =
MMM yyyy HH:mm:ss"); =
=
static {
logger.debug("Initialized with destination =3D [" +
@@ -262,6 +265,23 @@
// yes the error string contains an error code! let's specify =
the special jsp!
if (errorint !=3D 0) {
response.setStatus(errorint); // sets response status
+ if (errorint =3D=3D HttpServletResponse.SC_SERVICE_UNAVAIL=
ABLE) {
+ Throwable rootCause =3D t;
+ while (rootCause.getCause() !=3D null) {
+ rootCause =3D rootCause.getCause();
+ }
+ if (rootCause instanceof JahiaServerOverloadedExceptio=
n) {
+ JahiaServerOverloadedException ex =3D (JahiaServer=
OverloadedException) rootCause;
+
+ Calendar cal =3D Calendar.getInstance(TimeZone
+ .getTimeZone("GMT"));
+ cal.add(Calendar.SECOND, ex.getSuggestedRetryTime(=
));
+ response.setHeader("Retry-After", df.format(cal
+ .getTime())
+ + " GMT");
+ }
+ }
+ =
String filepath =3D DISPATCH_DIRECTORY + "/" + DISPATCH_PR=
EFIX + errorint + ".jsp";
String filerootpath =3D DISPATCH_ROOT;
String msg =3D "site error unenabled:";
@@ -306,6 +326,7 @@
RequestDispatcher dispatcher =3D context.getRequestDispatc=
her(contextPathToDestination);
if (dispatcher !=3D null) {
request.setAttribute("org.jahia.exception.Message", t.=
getMessage());
+ request.setAttribute("originalException", t); =
=
if (IS_STACK_INCLUDED) {
String stackTraceStr =3D stackTraceToString(t);
request.setAttribute("org.jahia.exception.StackTra=
ce", stackTraceStr);
Modified: trunk/core/src/java/org/jahia/operations/valves/EngineValve.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/operations/valves/EngineValve.java&rev=3D18225&repname=3Djahia
=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/core/src/java/org/jahia/operations/valves/EngineValve.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/operations/valves/EngineValve.java Wed Au=
g 22 14:16:22 2007
@@ -75,14 +75,16 @@
// So we did not find the page in the cache
// check if the page is already generating or is generated
// force generation
- Latch firstRequestLatch =3D null;
+ Latch firstRequestLatch =3D getGeneratorQueue().getFirstRequestLat=
ch();
boolean firstRequest =3D false;
- synchronized (getGeneratorQueue()) {
- firstRequestLatch =3D getGeneratorQueue().getFirstRequestLatch=
();
- if (firstRequestLatch =3D=3D null) {
- firstRequestLatch =3D new Latch();
- firstRequest =3D true;
- getGeneratorQueue().setFirstRequestLatch(firstRequestLatch=
);
+ if (firstRequestLatch =3D=3D null) {
+ synchronized (getGeneratorQueue()) {
+ firstRequestLatch =3D getGeneratorQueue().getFirstRequestL=
atch();
+ if (firstRequestLatch =3D=3D null) {
+ firstRequestLatch =3D new Latch();
+ firstRequest =3D true;
+ getGeneratorQueue().setFirstRequestLatch(firstRequestL=
atch);
+ }
}
}
=
Modified: trunk/core/src/webapp/jsp/jahia/errors/error_503.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/errors/error_503.jsp&rev=3D18225&repname=3Djahia
=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/core/src/webapp/jsp/jahia/errors/error_503.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/errors/error_503.jsp Wed Aug 22 14:16:2=
2 2007
@@ -14,21 +14,61 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><%@ page language =3D "java" %><?xml version=3D"1.0" encoding=3D"iso-8=
859-1"?>
+--%>
+<%@ page language =3D "java" %>
+<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.bin.Jahia" %>
+<%@ page import=3D"org.jahia.exceptions.JahiaServerOverloadedException"%>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
+<%@ page import=3D"java.text.MessageFormat"%>
+<%@ page import=3D"org.jahia.params.ParamBean"%>
+<%@ page import=3D"org.jahia.exceptions.JahiaException"%>
+<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
+<?xml version=3D"1.0" encoding=3D"iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
+<% =
+final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahia.pa=
rams.ParamBean");
+Throwable exception =3D (Throwable)request.getAttribute("originalException=
");
+while (exception.getCause() !=3D null) {
+ exception =3D exception.getCause();
+}
+int timeInSeconds =3D 0;
+boolean isDuringFirstRequest =3D false;
+if (exception instanceof JahiaServerOverloadedException) {
+ JahiaServerOverloadedException overloadedException =3D (JahiaServerOve=
rloadedException)exception;
+ timeInSeconds =3D overloadedException.getSuggestedRetryTime();
+ isDuringFirstRequest =3D overloadedException.isDuringFirstRequest();
+} =
+boolean isGetMethod =3D "GET".equals(request.getMethod());
+%>
<head>
- <%@ page import =3D "java.util.*" %>
- <%@ page import =3D "org.jahia.bin.Jahia" %>
- <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
- <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpServiceUnavailable.label"/></title>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3D"UTF=
-8"/>
<script language=3D"javascript" src=3D"<%=3Drequest.getContextPath()%>=
/jsp/jahia/errors/error_include.js" type=3D"text/JavaScript"></script>
<link rel=3D"stylesheet" href=3D"<jahia:serverHttpPath/>/jsp/jahia/eng=
ines/css/error.css" type=3D"text/css"/>
+<%if (isGetMethod && isDuringFirstRequest && timeInSeconds > 0) { %>
+ <title><jahia:engineResourceBundle resourceName=3D"org.jahia.ajax.load=
ing"/></title>
+<script type=3D"text/javascript" language=3D"javascript">
+<!--
+ function reloadPage() {
+ location.reload();
+ } =
+
+ window.onload =3D function() {
+ setTimeout("reloadPage()", <%=3DtimeInSeconds%>*1000);
+ }
+ //-->
+ </script> =
+<%} else {%> =
+ <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpServiceUnavailable.label"/></title>
+<%} %> =
</head>
=
<body>
-
+<%if (isGetMethod && isDuringFirstRequest && timeInSeconds > 0) { %>
+<jahia:engineResourceBundle resourceName=3D"org.jahia.ajax.loading"/>
+<%} else { %>
<br/><br/><br/>
=
<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
@@ -37,11 +77,32 @@
</tr>
<tr>
<td class=3D"boxcontentcolor2">
- <p class=3D"bold"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.bin.JahiaErrorDisplay.serviceUnavailable.label"/></p>
+ <p class=3D"bold"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.bin.JahiaErrorDisplay.serviceUnavailable.label"/>
+ <%
+ String retryInMessage =3D "";
+ if (timeInSeconds =3D=3D 0) {
+ retryInMessage =3D JahiaResourceBundle.getEngineResource(
+ "org.jahia.bin.JahiaErrorDisplay.retryLater.label"=
, jParams,
+ jParams.getLocale());
+ } else {
+ int hours, minutes, seconds;
+ hours =3D timeInSeconds / 3600;
+ timeInSeconds =3D timeInSeconds - (hours * 3600);
+ minutes =3D timeInSeconds / 60;
+ timeInSeconds =3D timeInSeconds - (minutes * 60);
+ seconds =3D timeInSeconds;
+ Object[] arguments =3D {new Integer(hours), new Integer(mi=
nutes), new Integer(seconds)};
+ retryInMessage =3D MessageFormat.format(JahiaResourceBundl=
e.getEngineResource(
+ "org.jahia.bin.JahiaErrorDisplay.retryInTime.label=
", jParams,
+ jParams.getLocale()), arguments); =
+ }
+ %>
+ <%=3DretryInMessage%>
+ </p>
=
<form name=3D"errorForm">
<script language=3D"Javascript" type=3D"text/JavaScript">
- document.writeln( "<a href=3D\"javascript:location.reload()\">=
<img name=3D\"Retry\" src=3D\"<jahia:serverHttpPath/><jahia:engineResourceB=
undle resourceName=3D"org.jahia.refreshOff.button"/>\" width=3D\"69\" heigh=
t=3D\"17\" border=3D\"0\" alt=3D\"<jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.close.label"/>\"></a>" );
+ document.writeln( "<a href=3D\"javascript:location.reload()\">=
<img name=3D\"Retry\" src=3D\"<jahia:serverHttpPath/><jahia:engineResourceB=
undle resourceName=3D"org.jahia.refreshOff.button"/>\" width=3D\"69\" heigh=
t=3D\"17\" border=3D\"0\" alt=3D\"<jahia:engineResourceBundle resourceName=
=3D"org.jahia.bin.JahiaErrorDisplay.retry.label"/>\"></a>" );
</script>
</form>
=
@@ -50,4 +111,5 @@
</table>
=
</body>
-</html>
\ No newline at end of file
+<%}%>
+</html>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
