Author: bpapez
Date: Thu Aug 16 17:11:33 2007
New Revision: 18187
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18187&repname=
=3Djahia
Log:
Fix and improve error handling for error 503 (Service temporarily unavailab=
le)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_d=
e.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
s.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_i=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_p=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaErrorDisp=
lay.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18187&rep=
name=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Thu Aug 16 17:11:33 2007
@@ -558,7 +558,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D The file that you r=
equested could not be found on this server or has been deleted.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ession Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
@@ -566,8 +566,9 @@
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.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Your session has =
expired, please logon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties Thu Aug 16 17:11:33 2007
@@ -558,7 +558,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Die angeforderte Da=
tei befindet sich nicht auf diesem Server oder wurde gel\u00F6scht.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Nicht zul=
\u00E4ssig
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Nicht gefu=
nden
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
itzung abgelaufen
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service vor\u00FCbergehend nicht verf\u00FCgbar
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia-Fehler
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP-Fehler
org.jahia.bin.JahiaErrorDisplay.login.label =3D Anmelden
@@ -567,7 +567,7 @@
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.returnToJahia.label =3D Klicken Sie hier, =
um zu Jahia zur\u00FCckzukehren.
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Ihre Sitzung ist =
abgelaufen, bitte melden Sie sich erneut an.
+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.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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Thu Aug 16 17:11:33 2007
@@ -558,7 +558,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D The file that you r=
equested could not be found on this server or has been deleted.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ession Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
@@ -567,7 +567,7 @@
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.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Your session has =
expired, please logon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_es.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties Thu Aug 16 17:11:33 2007
@@ -558,7 +558,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D El archivo que soli=
cit\u00F3 no se encontr\u00F3 en este servidor o ha sido eliminado.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 prohibido
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 no encontr=
ado
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 c=
aducidad de sesi\u00F3n
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
servicio no disponible
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Error de Jahia
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D Error JSP
org.jahia.bin.JahiaErrorDisplay.login.label =3D Iniciar sesi\u00F3n
@@ -567,7 +567,7 @@
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Se envi\u00F3 u=
na notificaci\u00F3n por correo electr\u00F3nico al administrador.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - P\u00E1gina n=
o encontrada.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Para volver a Jahi=
a haga clic aqu\u00ED
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Su sesi\u00F3n ha=
caducado. Inicie sesi\u00F3n nuevamente.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Su sesi\u00F3=
n ha caducado. Inicie sesi\u00F3n nuevamente.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Si este error oc=
urre nuevamente,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D haga clic aqu\u0=
0ED para ver el c\u00F3digo fuente html
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Luego encontrar\=
u00E1 los detalles del error (seguimiento de la pila). C\u00F3pielos y env\=
u00EDelos al administrador de su sitio para que pueda resolver el problema.=
Lamentamos las molestias ocasionadas.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Thu Aug 16 17:11:33 2007
@@ -135,7 +135,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Le fichier que vous=
avez demand=C3=A9 ne se trouve pas sur le serveur ou a =C3=A9t=C3=A9 d=C3=
=A9truit.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Interdit
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Non trouv=
=C3=A9
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ession expir=C3=A9e
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Le service n'est plus disponible
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Erreur Jahia
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D Erreur JSP
org.jahia.bin.JahiaErrorDisplay.login.label =3D S'authentifier
@@ -144,7 +144,7 @@
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.returnToJahia.label =3D Cliquez ici pour r=
evenir =C3=A0 Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Votre session a e=
xpir=C3=A9.<br>nbsp; Veuillez vous reconnecter.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Votre session=
a expir=C3=A9.<br>nbsp; Veuillez vous reconnecter.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_it.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties Thu Aug 16 17:11:33 2007
@@ -558,7 +558,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Il file richiesto n=
on pu\u00F2 essere trovato su questo server o \u00E8 stato eliminato.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Vietato
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Non trovato
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
essione terminata
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Servizio non disponibile
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Errore Jahia
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D Errore JSP
org.jahia.bin.JahiaErrorDisplay.login.label =3D Accesso
@@ -567,7 +567,7 @@
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.returnToJahia.label =3D Fare clic qui per =
tornare a Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D La sessione \u00E=
8 scaduta, riaccedere.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D La sessione \=
u00E8 scaduta, riaccedere.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_pt.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties Thu Aug 16 17:11:33 2007
@@ -558,7 +558,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D O arquivo solicitad=
o n\u00E3o p\u00F4de ser encontrado neste servidor ou foi exclu\u00EDdo.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Proibido
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 N\u00E3o e=
ncontrado
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ess\u00E3o expirada
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Servi\u00E7o indispon\u00CDvel
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Erro do Jahia
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D Erro JSP
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
@@ -567,7 +567,7 @@
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Um e-mail de no=
tifica\u00E7\u00E3o foi enviado ao Administrador.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - P\u00E1gina n=
\u00E3o encontrada.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Clique aqui para v=
oltar ao Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Sua sess\u00E3o e=
xpirou. Fa\u00E7a login novamente.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Sua sess\u00E=
3o expirou. Fa\u00E7a login novamente.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Se este erro oco=
rrer novamente,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D clique aqui para=
ver o c\u00F3digo html
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Voc\u00EA encont=
rar\u00E1 ent\u00E3o os detalhes do erro (stack trace). Copie e envie esses=
dados ao administrador do site para que ele possa resolver o problema. Lam=
entamos o inconveniente.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources.properties&rev=3D18187&rep=
name=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources.p=
roperties Thu Aug 16 17:11:33 2007
@@ -193,14 +193,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D The file that you r=
equested could not be found on this server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ession Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
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.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Your session has =
expired, please logon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_de.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_d=
e.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_d=
e.properties Thu Aug 16 17:11:33 2007
@@ -190,14 +190,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Die von Ihnen angef=
orderte Datei konnte auf diesem Server nicht gefunden werden.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Nicht zul=
=C3=A4ssig
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Nicht gefu=
nden
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
itzung abgelaufen
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service vor\u00FCbergehend nicht verf\u00FCgbar
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia-Fehler
org.jahia.bin.JahiaErrorDisplay.login.label =3D Anmelden
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Sie m=C3=BCssen sich =
erneut anmelden
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.returnToJahia.label =3D Klicken Sie hier, =
um zu Jahia zur=C3=BCckzukehren.
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Ihre Sitzung ist =
abgelaufen, bitte melden Sie sich erneut an.
+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.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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_en.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
n.properties Thu Aug 16 17:11:33 2007
@@ -193,7 +193,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D The file that you r=
equested could not be found on this server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ession Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D You must log in again
@@ -201,7 +201,7 @@
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.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Your session has =
expired, please logon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available. Please try again later.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_es.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
s.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
s.properties Thu Aug 16 17:11:33 2007
@@ -189,14 +189,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D No se pudo encontra=
r el archivo que solicit=C3=B3 en el servidor.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 prohibido
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 no encontr=
ado
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 c=
aducidad de sesi=C3=B3n
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
servicio no disponible
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Error de Jahia
org.jahia.bin.JahiaErrorDisplay.login.label =3D Iniciar sesi=C3=B3n
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Debe iniciar sesi=C3=
=B3n nuevamente
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Se envi=C3=B3 u=
na notificaci=C3=B3n por correo electr=C3=B3nico al administrador.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - P=C3=A1gina n=
o encontrada.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Para volver a Jahi=
a haga clic aqu=C3=AD
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Su sesi=C3=B3n ha=
caducado. Inicie sesi=C3=B3n nuevamente.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Su sesi=C3=B3=
n ha caducado. Inicie sesi=C3=B3n nuevamente.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Error de sitio =
virtual: sitio no encontrado.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D Advertencia duran=
te el procesamiento. Si recibe este mensaje varias veces, comun=C3=ADquese =
con el <br> administrador.
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_fr.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_f=
r.properties Thu Aug 16 17:11:33 2007
@@ -196,7 +196,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Le fichier que vous=
avez demand=C3=A9 ne se trouve pas sur le serveur.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Interdit
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Non trouv=
=C3=A9
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ession expir=C3=A9e
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Le service n'est plus disponible
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Erreur Jahia
org.jahia.bin.JahiaErrorDisplay.login.label =3D S'authentifier
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Vous devez de nouveau=
vous connecter
@@ -204,7 +204,7 @@
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.returnToJahia.label =3D Cliquez ici pour r=
evenir =C3=A0 Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Votre session a e=
xpir=C3=A9.<br>nbsp; Veuillez vous reconnecter.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Votre session=
a expir=C3=A9.<br>nbsp; Veuillez vous reconnecter.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_it.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_i=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_i=
t.properties Thu Aug 16 17:11:33 2007
@@ -189,14 +189,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Il file richiesto n=
on =C3=A8 stato trovato su questo server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Vietato
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Non trovato
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
essione terminata
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Servizio non disponibile
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Errore Jahia
org.jahia.bin.JahiaErrorDisplay.login.label =3D Accesso
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D =C3=88 necessario acc=
edere di nuovo
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.returnToJahia.label =3D Fare clic qui per =
tornare a Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D La sessione =C3=
=A8 scaduta, riaccedere.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D La sessione =
=C3=A8 scaduta, riaccedere.
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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_pt.properties&rev=3D18187&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_p=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_p=
t.properties Thu Aug 16 17:11:33 2007
@@ -189,14 +189,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D O arquivo solicitad=
o n=C3=A3o foi encontrado neste servidor.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Proibido
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 N=C3=A3o e=
ncontrado
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 S=
ess=C3=A3o expirada
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Servi\u00E7o indispon\u00CDvel
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Erro do Jahia
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Fa=C3=A7a login novam=
ente
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Um e-mail de no=
tifica=C3=A7=C3=A3o foi enviado ao Administrador.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - P=C3=A1gina n=
=C3=A3o encontrada.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Clique aqui para v=
oltar ao Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Sua sess=C3=A3o e=
xpirou. Fa=C3=A7a login novamente.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Sua sess=C3=
=A3o expirou. Fa=C3=A7a login novamente.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Erro de site vi=
rtual: site n=C3=A3o encontrado.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D Alerta durante o =
processamento. Contate o <br> administrador se essa mensagem aparecer com f=
req=C3=BC=C3=AAncia.
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaErr=
orDisplay.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/JahiaErrorDisplay.java&rev=3D18187&repn=
ame=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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaErrorDisp=
lay.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaErrorDisp=
lay.java Thu Aug 16 17:11:33 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;
@@ -50,6 +52,7 @@
import java.io.StringWriter;
import java.lang.reflect.InvocationTargetException;
import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -86,6 +89,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 +266,15 @@
// 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
+ && t instanceof JahiaServerOverloadedException) {
+ JahiaServerOverloadedException ex =3D (JahiaServerOver=
loadedException)t;
+ =
+ Calendar cal =3D Calendar.getInstance(TimeZone.getTime=
Zone("GMT"));
+ cal.add(Calendar.SECOND, ex.getSuggestedRetryTime());
+ response.setHeader("Retry-After", df.format(cal.getTim=
e())+" GMT");
+ }
+ =
String filepath =3D DISPATCH_DIRECTORY + "/" + DISPATCH_PR=
EFIX + errorint + ".jsp";
String filerootpath =3D DISPATCH_ROOT;
String msg =3D "site error unenabled:";
@@ -306,6 +319,7 @@
RequestDispatcher dispatcher =3D context.getRequestDispatc=
her(contextPathToDestination);
if (dispatcher !=3D null) {
request.setAttribute("org.jahia.exception.Message", t.=
getMessage());
+ request.setAttribute("org.jahia.exception.Exception", =
t); =
if (IS_STACK_INCLUDED) {
String stackTraceStr =3D stackTraceToString(t);
request.setAttribute("org.jahia.exception.StackTra=
ce", stackTraceStr);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_503.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_503.jsp&rev=3D18187&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_503=
.jsp Thu Aug 16 17:11:33 2007
@@ -21,7 +21,7 @@
<%@ 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.httpSessionExpiration.label"/></title>
+ <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"/>
@@ -37,15 +37,11 @@
</tr>
<tr>
<td class=3D"boxcontentcolor2">
- <p class=3D"bold"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.bin.JahiaErrorDisplay.sessionExpired.label"/></p>
+ <p class=3D"bold"><jahia:engineResourceBundle resourceName=3D"org.=
jahia.bin.JahiaErrorDisplay.serviceUnavailable.label"/></p>
=
<form name=3D"errorForm">
<script language=3D"Javascript" type=3D"text/JavaScript">
- if (window.opener !=3D null) {
- document.writeln( "<a href=3D\"javascript:window.close()\"=
onMouseOut=3D\"MM_swapImgRestore()\" onMouseOver=3D\"MM_swapImage('Close',=
'','<jahia:serverHttpPath/><jahia:engineResourceBundle resourceName=3D"org.=
jahia.closeOn.button"/>',1)\"><img name=3D\"Close\" src=3D\"<jahia:serverHt=
tpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia.closeOff.butt=
on"/>\" width=3D\"69\" height=3D\"17\" border=3D\"0\" alt=3D\"<jahia:engine=
ResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDisplay.close.label"=
/>\"></a>" );
- } else {
- document.writeln( "<a href=3D\"javascript:EnginePopup('log=
in')\" onMouseOut=3D\"MM_swapImgRestore()\" onMouseOver=3D\"MM_swapImage('L=
ogin','','<jahia:serverHttpPath/><jahia:engineResourceBundle resourceName=
=3D"org.jahia.loginOn.button"/>',1)\"><img name=3D\"Login\" src=3D\"<jahia:=
serverHttpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia.login=
Off.button"/>\" width=3D\"69\" height=3D\"17\" border=3D\"0\" alt=3D\"<jahi=
a:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDisplay.logi=
n.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.close.label"/>\"></a>" );
</script>
</form>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
