Author: bpapez
Date: Wed Aug 22 15:11:49 2007
New Revision: 18227
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18227&repname=
=3Djahia
Log:
Fix and improve error handling for error 503 (Service temporarily unavailab=
le)
- reduce default page generation wait time from 30 minutes to 2 minutes
- fix the texts in the error JSP
Modified:
branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_de.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_en.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_es.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_fr.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_it.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_nl.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_de.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_en.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_fr.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_it.properties
branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_nl.properties
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBean.java
branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/errors/error_503.jsp
Modified: branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/etc/config/jahia.skeleton&rev=3D18227&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-4-1-BRANCH/etc/config/jahia.skeleton (original)
+++ branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton Wed Aug 22 15:11:49=
2007
@@ -351,7 +351,7 @@
=
# This variable controls how long threads are waiting to be able to start
# generating pages (in heavy load situations)
-pageGenerationWaitTime =3D 1800000
+pageGenerationWaitTime =3D 120000
=
######################################################################
### Cluster settings ################################################
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources.properties&rev=3D18227&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-4-1-BRANCH/src/java/JahiaEnginesResources.properties (or=
iginal)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources.properties Wed=
Aug 22 15:11:49 2007
@@ -503,15 +503,16 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D The file that you requested could n=
ot 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 Session Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Service temporarily unavai=
lable
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =
=3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.jspError.label
=3D JSP Er=
ror
org.jahia.bin.JahiaErrorDisplay.login.label =
=3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =
=3D Please login into the system if you=
haven't already.
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =
=3D A mail notification has been sent t=
o the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Page not found.
+org.jahia.bin.JahiaErrorDisplay.retry.label =
=3D Retry
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Click here to return to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Your session has expired, please lo=
gon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Service is temporarily not availabl=
e. Please try again later.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =
=3D If this error occurs again, please
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =
=3D click here to view 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 site manager so that h=
e can solve the problem. Sorry for the inconvenience
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_de.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources_de.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaEnginesResources_de.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_de.properties =
Wed Aug 22 15:11:49 2007
@@ -522,15 +522,16 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label
=3D Die =
gesuchte Datei konnte auf diesem Server nicht gefunden werden.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label
=3D HTT=
P 403 Zugriff nicht erlaubt
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label
=3D HTTP=
404 nicht gefunden
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label
=
=3D HTTP 503 Session ist abgelaufen
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Service vor\u00FCbergehe=
nd nicht verf\u00FCgbar
org.jahia.bin.JahiaErrorDisplay.jahiaError.label
=3D Jahia =
Fehler
org.jahia.bin.JahiaErrorDisplay.jspError.label
=3D JSP Feh=
ler
org.jahia.bin.JahiaErrorDisplay.login.label
=3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label
=3D Sie m&=
uuml;ssen sich erneut anmelden.
org.jahia.bin.JahiaErrorDisplay.mailNotification.label
=3D E=
s wurde eine eMail an den Administrator versandt.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label
=3D 404 =
- Seite nicht gefunden
+org.jahia.bin.JahiaErrorDisplay.retry.label =
=3D Wiederholen
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label
=3D Kli=
cken sie hier um zu Jahia zurück zu kehren
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label
=3D Ihr=
e Sitzung ist abgelaufen, bitte loggen sie nochmals ein.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Das Service ist vor=C3=BCbergehen=
d nicht verf\u00FCgbar. Bitte versuchen sie es zu einem sp\u00E4teren Zeitp=
unkt wieder.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label
=3D We=
nn dieser Fehler wieder auftretet, bitte
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label
=3D Kl=
icken sie hier um den HTML Sourccode anzuschauen
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label
=3D Si=
e bekommen dann die Fehlerdetails (Stacktrace). Kopieren sie die Details un=
d senden sie sie an ihren Administrator, damit der Fehler behoben werden ka=
nn. Entschuldigen sie die Unannehmlichkeiten.
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_en.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources_en.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaEnginesResources_en.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_en.properties =
Wed Aug 22 15:11:49 2007
@@ -502,15 +502,16 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D The file that you requested could n=
ot 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 Session Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Service temporarily unavai=
lable
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =
=3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.jspError.label
=3D JSP Er=
ror
org.jahia.bin.JahiaErrorDisplay.login.label =
=3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =
=3D Please login into the system if you=
haven't already.
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =
=3D A mail notification has been sent t=
o the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Page not found.
+org.jahia.bin.JahiaErrorDisplay.retry.label =
=3D Retry
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Click here to return to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Your session has expired, please lo=
gon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Service is temporarily not availabl=
e. Please try again later.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =
=3D If this error occurs again, please
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =
=3D click here to view 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 site manager so that h=
e can solve the problem. Sorry for the inconvenience
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_es.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources_es.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaEnginesResources_es.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_es.properties =
Wed Aug 22 15:11:49 2007
@@ -195,15 +195,15 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D EL fichero que ha solicitado no se =
encuentra en el servidor.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =
=3D HTTP 403 Prohibido
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =
=3D HTTP 404 No encontrado
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =
=3D HTTP 503 Sesión terminada
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 servicio no disponible
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =
=3D Error Jahia
-org.jahia.bin.JahiaErrorDisplay.jspError.label
=3D Error JSP
+org.jahia.bin.JahiaErrorDisplay.jspError.label
=
=3D Error JSP
org.jahia.bin.JahiaErrorDisplay.login.label =
=3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =
=3D Rogamos se identifique si todav&iac=
ute;a no lo ha hecho.
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =
=3D Un mail de notification ha sido env=
iado al administrador.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Página no encontrada
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Clique aqui para volver a Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Su sesión ha terminado.<br>&=
nbsp; rogamos se reconecte.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Servicio no disponible.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =
=3D Si este error se produce de nuevo
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =
=3D Clique aquí para ver el c&oa=
cute;digo HTML
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =
=3D Encontrara los detalles del error (=
stack trace). Copielos y envielos a su administrador para que pueda corregi=
r el problema.
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_fr.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources_fr.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaEnginesResources_fr.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_fr.properties =
Wed Aug 22 15:11:49 2007
@@ -196,7 +196,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D Le fichier que vous avez demand&eac=
ute; 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é
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =
=3D HTTP 503 Session expirée
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Le service n'est plus disp=
onible
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 Login
@@ -204,7 +204,7 @@
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =
=3D Un mail de notification a ét=
é envoyé à l'administrateur.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Page non trouvée
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Cliquer ici pour retourner à =
Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Votre session a expirée,<br>=
veuillez vous reconnecter.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Le service n'est plus disponible.<b=
r>nbsp; Veuillez essayer plus tard.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =
=3D Si cette erreur se reproduit &agrav=
e;nouveau
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =
=3D Cliquez ici pour voir le code HTML
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =
=3D Vous trouverez le détail de =
l'erreur (stack trace). Copiez-le et envoyez-le à votre administrate=
ur pour qu'il puisse corriger ce problème. Pardon pour le dér=
angement
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_it.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources_it.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaEnginesResources_it.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_it.properties =
Wed Aug 22 15:11:49 2007
@@ -242,7 +242,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label=3DIl file che si sta ri=
chiedendo non \u00E8 disponibile su questo server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label=3DHTTP 403 Vietato
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label=3DHTTP 404 Non trovato
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label=3DHTTP 503 Ses=
sione Terminata
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Servizio non disponibile
org.jahia.bin.JahiaErrorDisplay.jahiaError.label=3DErrore Jahia
org.jahia.bin.JahiaErrorDisplay.jspError.label=3DErrore JSP
org.jahia.bin.JahiaErrorDisplay.login.label=3DLogin
@@ -250,7 +250,7 @@
org.jahia.bin.JahiaErrorDisplay.mailNotification.label=3DUna mail di notif=
ica \u00E8 stata inviata all'amministratore.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label=3D404 - Pagina non trov=
ata.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label=3DRitornare a Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label=3DLa sessione \u00E8 =
terminata, \u00E8 necessario effettuare di nuovo il login.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Servizio non =
disponibile. Provare pi\u00F9 tardi.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label=3DSe questo errore s=
i verifica nuovamente,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label=3Dmostra il codice H=
TML
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label=3DTrovare il dettagl=
io dell'errore (stack trace). Copialo e mandalo al site manager affinch\u00=
E8 possa risolvere il problema. Ci scusiamo per l'inconveniente
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_nl.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaEnginesResources_nl.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaEnginesResources_nl.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaEnginesResources_nl.properties =
Wed Aug 22 15:11:49 2007
@@ -532,7 +532,7 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =3D Het door u opgev=
raagde bestand staat niet op deze server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Verboden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Niet Ge=
vonden
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =3D HTTP 503 =
Sessie Verlooptijd
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503=
Dienst niet beschikbaar
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Fout
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP Fout
org.jahia.bin.JahiaErrorDisplay.login.label =3D Aanmelden
@@ -540,7 +540,7 @@
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Per email is =
een notificatie naar de beheerder gestuurd.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Pagina niet=
gevonden.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Klik hier om ter=
ug te keren naar Jahia.
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =3D Uw sessie is ver=
lopen, meld u zich opnieuw aan.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Dienst niet =
beschikbaar. Probeer het later opnieuw.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Als deze fout =
verschijnt,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D klik dan hier o=
m de html bron te bekijken.
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Hier treft u in=
formatie over de foutmelding (stack trace). Maak een kopie en stuur dit naa=
r de website manager die het probleem wellicht kan oplossen. Excuses voor h=
et ongemak.
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaMessageResources.properties&rev=3D18227&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-4-1-BRANCH/src/java/JahiaMessageResources.properties (or=
iginal)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources.properties Wed=
Aug 22 15:11:49 2007
@@ -170,14 +170,15 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D The file that you requested could n=
ot 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 Session Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Service temporarily unavai=
lable
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 notification has been sent t=
o the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Page not found.
+org.jahia.bin.JahiaErrorDisplay.retry.label =
=3D Retry
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Click here to return to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Your session has expired, please lo=
gon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Service is temporarily not availabl=
e. Please try again later.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =
=3D Virtual site error : Site not found.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =
=3D An warning has occured during proce=
ssing. Please contact the <br> administrator if you get this message repeat=
edly.
=
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_de.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaMessageResources_de.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaMessageResources_de.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_de.properties =
Wed Aug 22 15:11:49 2007
@@ -165,20 +165,21 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label
=3D Die ge=
suchte Datei konnte auf dem Server nicht gefunden werden.
=
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label
=3D HTTP =
403 Zugriff verboten =
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label
=3D HTTP 4=
04 Seite nicht gefunden =
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label
=3D=
HTTP 503 Session ist abgelaufen
=
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Service vor\u00FCbergehend nicht=
verf\u00FCgbar =
org.jahia.bin.JahiaErrorDisplay.jahiaError.label
=3D Jahia Fe=
hler =
org.jahia.bin.JahiaErrorDisplay.login.label
=3D Anmeldung =
=
org.jahia.bin.JahiaErrorDisplay.loginAgain.label
=3D Sie m&uu=
ml;ssen sich erneut anmelden. =
org.jahia.bin.JahiaErrorDisplay.mailNotification.label
=3D Es =
wurde eine eMail an den Administrator versandt.
=
-org.jahia.bin.JahiaErrorDisplay.pageNotFound.label
=3D 404 - =
Seite nicht gefunden =
+org.jahia.bin.JahiaErrorDisplay.pageNotFound.label
=3D 404 - =
Seite nicht gefunden
+org.jahia.bin.JahiaErrorDisplay.retry.label =
=3D Wiederholen
=
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label
=3D Bitte=
hier drücken um zu Jahia zurück zu kehren.
=
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label
=3D
Ihre =
Session ist abgelaufen, bitte erneut anmelden.
=
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Das Service ist vor=C3=BCbergehend nicht =
verf\u00FCgbar. Bitte versuchen sie es zu einem sp\u00E4teren Zeitpunkt wie=
der. =
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label
=3D Vir=
tual Site Fehler: Site wurde nicht gefunden.
=
org.jahia.bin.JahiaErrorDisplay.warningOccured.label
=3D Es
is=
t eine Warnung während der Verarbeitung aufgetreten.<br> Wenn diese Wa=
rnung häufiger auftritt kontaktieren Sie bitte den Administrator.
=
=
org.jahia.data.FormDataManager.illegalTag
=3D Ungültig=
er HTML Tag: <{0}> =
org.jahia.data.FormDataManager.tagMissingLtOrGt
=3D Fehlende=
< oder > für Tags innerhalb des Textes.
=
org.jahia.data.FormDataManager.tagNotClosed
=3D Tag <{0}=
> nicht geschlossen =
-org.jahia.data.HtmlParser.htmlParserError =
=3D Html Fehler :<br> {0};
+org.jahia.data.HtmlParser.htmlParserError =
=3D Html Fehler :<br> {0};
org.jahia.databaseSettings.label
=3D Datenbank Einstellun=
gen =
org.jahia.databaseURL.label
=3D Datenbank URL
org.jahia.engines.mysettings.passwordsDontMatch =
=3D Passwörter sind nicht ident
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_en.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaMessageResources_en.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaMessageResources_en.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_en.properties =
Wed Aug 22 15:11:49 2007
@@ -170,14 +170,15 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D The file that you requested could n=
ot 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 Session Expiration
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Service temporarily unavai=
lable
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 notification has been sent t=
o the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Page not found.
+org.jahia.bin.JahiaErrorDisplay.retry.label =
=3D Retry
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Click here to return to Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Your session has expired, please lo=
gon again.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Service is temporarily not availabl=
e. Please try again later.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =
=3D Virtual site error : Site not found.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =
=3D An warning has occured during proce=
ssing. Please contact the <br> administrator if you get this message repeat=
edly.
=
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_fr.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaMessageResources_fr.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaMessageResources_fr.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_fr.properties =
Wed Aug 22 15:11:49 2007
@@ -159,14 +159,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D Le fichier que vous rechercher ne p=
eut être trouvé sur le serveur.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =
=3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =
=3D HTTP 404 Non trouvé
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =
=3D HTTP 503 Session expirée
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Le service n'est plus disp=
onible
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =
=3D Erreur Jahia
org.jahia.bin.JahiaErrorDisplay.login.label =
=3D Se connecter
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =
=3D Vous devez vous identifier à=
nouveau
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =
=3D Un mail de notification a ét=
é envoyé à l'administrateur.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Page non trouv=C3=A9e.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Cliquer ici pour retourner à=
Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Votre session a expirée, veu=
illez vous identifier à nouveau.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Le service n'est plus disponible.<b=
r>nbsp; Veuillez essayer plus tard.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =
=3D Erreur de site virtuel : Site non t=
rouvé.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =
=3D Une alerte est survenue durant le p=
rocessus. Veuillez contacter <br> l'administrateur si vous obtenez ce messa=
ge fréquemment.
=
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_it.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaMessageResources_it.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaMessageResources_it.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_it.properties =
Wed Aug 22 15:11:49 2007
@@ -116,14 +116,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label=3DIl file che si sta ri=
chiedendo non \u00E8 presente su questo server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label=3DHTTP 403 Vietato
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label=3DHTTP 404 Non Trovato
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label=3DHTTP 503 Ses=
sione Terminata
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Servizio non disponibile
org.jahia.bin.JahiaErrorDisplay.jahiaError.label=3DErrore Jahia
org.jahia.bin.JahiaErrorDisplay.login.label=3DLogin
org.jahia.bin.JahiaErrorDisplay.loginAgain.label=3DE' necessario effettuar=
e di nuovo il login
org.jahia.bin.JahiaErrorDisplay.mailNotification.label=3DUna mail di notif=
ica \u00E8 stata inviata all'amministratore.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label=3D404 - Pagina non trov=
ata.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label=3DRitornare a Jahia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label=3DLa sessione \u00E8 =
terminata, \u00E8 necessario effettuare di nuovo il login.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Servizio non =
disponibile. Provare pi\u00F9 tardi.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label=3DErrore di sito vi=
rtuale \: Sito non trovato.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label=3DUn avvertimento \u0=
0E8 stato generato da Jahia. Contattare l' <br> amministratore se questo me=
ssaggio dovesse ripetersi di nuovo.
org.jahia.cancelOff.button=3D/jsp/jahia/engines/images_it/buttons/cancel_o=
ff.gif
Modified: branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_nl.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/JahiaMessageResources_nl.properties&rev=3D18227&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/JahiaMessageResources_nl.properties =
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/JahiaMessageResources_nl.properties =
Wed Aug 22 15:11:49 2007
@@ -156,14 +156,14 @@
org.jahia.bin.JahiaErrorDisplay.fileNotFound.label =
=3D Het bestand dat u zoekt is niet gev=
onden op deze server.
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =
=3D HTTP 403 Verboden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =
=3D HTTP 404 Niet Gevonden
-org.jahia.bin.JahiaErrorDisplay.httpSessionExpiration.label =
=3D HTTP 503 Sessie Verlopen
+org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =
=3D HTTP 503 Dienst niet beschikbaar
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =
=3D Jahia Fout
org.jahia.bin.JahiaErrorDisplay.login.label =
=3D Aanmelden
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =
=3D U moet zich opnieuw aanmelden
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =
=3D Een mail notificatie is verstuurd n=
aar de beheerder.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =
=3D 404 - Pagina niet gevonden.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =
=3D Klik hier om terug te keren naar Ja=
hia
-org.jahia.bin.JahiaErrorDisplay.sessionExpired.label =
=3D Uw sessie is verlopen, meld u opnie=
uw aan.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =
=3D Dienst niet beschikbaar. Probeer he=
t later opnieuw.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =
=3D Virtuele site fout : Site niet gevo=
nden.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =
=3DTijdens de verwerking is een waarsch=
uwing opgetreden. Neem contact op met de <br> beheerder als u deze boodscha=
p herhaaldelijk ontvangt.
=
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBea=
n.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/settings/SettingsBean.java&rev=3D18227&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/src/java/org/jahia/settings/SettingsBean.java=
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBean.java=
Wed Aug 22 15:11:49 2007
@@ -226,7 +226,7 @@
=
// Core engine page generation queue configuration parameters
private int maxParallelProcessings =3D 10;
- private long pageGenerationWaitTime =3D 1800000; // in milliseconds
+ private long pageGenerationWaitTime =3D 120000; // in milliseconds
=
/**
* Default constructor.
Modified: branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/errors/error_503.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/views/jsp/jahia/errors/error_503.jsp&rev=3D18227&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-4-1-BRANCH/src/views/jsp/jahia/errors/error_503.jsp (ori=
ginal)
+++ branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/errors/error_503.jsp Wed =
Aug 22 15:11:49 2007
@@ -5,7 +5,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"/>
@@ -21,15 +21,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.retry.label"/>\"></a>" );
</script>
</form>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
