Author: bpapez
Date: Thu Aug 30 16:05:42 2007
New Revision: 18313
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18313&repname=
=3Djahia
Log:
Read-only mode for a cluster node
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/exceptions/JahiaIn=
validModeException.java
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/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/java/org/jahia/params/ProcessingC=
ontext.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.s=
keleton
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/operation=
buttons.inc
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc
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=3D18313&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 30 16:05:42 2007
@@ -559,6 +559,8 @@
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.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
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,6 +568,7 @@
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.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
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.
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=3D18313&=
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 30 16:05:42 2007
@@ -559,6 +559,8 @@
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.httpServiceUnavailable.label =3D HTTP 503 =
Service vor\u00FCbergehend nicht verf\u00FCgbar
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Ung\u00FClt=
iger Modus
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D Ihr Anforde=
rung ist in einem ung\u00FCltigen Modus f\u00FCr diesen Server.
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
@@ -566,6 +568,7 @@
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.redirectToNormal.label =3D Sie werden in {=
0} Sekunden zum normalen Modus umgeleitet.
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.
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=3D18313&=
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 30 16:05:42 2007
@@ -559,6 +559,8 @@
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.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
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,6 +568,7 @@
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.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
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.
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=3D18313&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 30 16:05:42 2007
@@ -194,11 +194,14 @@
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.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
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.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
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.
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=3D18313&=
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 30 16:05:42 2007
@@ -191,11 +191,14 @@
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.httpServiceUnavailable.label =3D HTTP 503 =
Service vor\u00FCbergehend nicht verf\u00FCgbar
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Ung\u00FClt=
iger Modus
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D Ihr Anforde=
rung ist in einem ung\u00FCltigen Modus f\u00FCr diesen Server.
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.redirectToNormal.label =3D Sie werden in {=
0} Sekunden zum normalen Modus umgeleitet.
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.
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=3D18313&=
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 30 16:05:42 2007
@@ -194,12 +194,15 @@
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.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
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.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.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
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.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/exceptions/Jahi=
aInvalidModeException.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/java/org/jahia/exceptions/JahiaInvalidModeException=
.java&rev=3D18313&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/java/org/jahia/exceptions/JahiaIn=
validModeException.java (added)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/exceptions/JahiaIn=
validModeException.java Thu Aug 30 16:05:42 2007
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2006 Jahia Ltd
+ *
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
+ * not use this file except in compliance with the License. You should hav=
e =
+ * received a copy of the License along with this program; if not, you may=
obtain =
+ * a copy of the License at =
+ *
+ * http://www.jahia.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software =
+ * distributed under the License is distributed on an "AS IS" BASIS, =
+ * 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.
+ */// $Id: JahiaForbiddenAccessException.java 14745 2006-07-20 14:58:38Z s=
huber $
+//
+
+
+package org.jahia.exceptions;
+
+
+/**
+ * This exception is raised when the user tries to access a resource, for =
which
+ * the mode is not valid (e.g. edit mode on a read-only cluster node)
+ */
+public class JahiaInvalidModeException extends JahiaException
+{
+
+ //--------------------------------------------------------------------=
-----
+ /** Default constructor
+ */
+ public JahiaInvalidModeException ()
+ {
+ super ("403 Invalid mode", "403 Invalid mode",
+ UNAVAILABLE_ERROR, ERROR_SEVERITY);
+ }
+}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18313&r=
epname=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/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Thu Aug 30 16:05:42 2007
@@ -2176,28 +2176,9 @@
theUrl.append(paramValue);
}
}
- String paramValue =3D getSiteURLPart();
- String paramSep =3D "?";
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- paramValue =3D getOpModeURLPart(getOpMode());
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- if (getContentPage() !=3D null) {
- paramValue =3D getPageURLPart(getContentPage().getID());
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- }
-
+ theUrl.append(getSiteAndModeAndPageAsURLParams("?"));
+ String paramSep =3D "&";
+ String paramValue; =
final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
while (propertyNames.hasMoreElements()) {
final String propertyName =3D (String) propertyNames.nextEleme=
nt();
@@ -3164,7 +3145,11 @@
}
=
private void checkPageAccess(final int pageID) throws JahiaException {
-
+ if (settings().isReadOnlyMode()
+ && CORE_ENGINE_NAME.equals(this.getEngine())
+ && !NORMAL.equals(getOpMode()))
+ throw new JahiaInvalidModeException();
+ =
if (getContentPage() !=3D null) {
int pageType =3D getContentPage().getPageType(getEntryLoadRequ=
est());
if (pageType > -1 && pageType !=3D ContentPage.TYPE_DIRECT) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/Set=
tingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/settings/SettingsBean.java&rev=3D18313&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/settings/SettingsB=
ean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java Thu Aug 30 16:05:42 2007
@@ -337,6 +337,7 @@
private boolean useFlatFileManager;
private boolean showTimeBasedPublishingIcons;
private boolean developmentMode =3D true;
+ private boolean readOnlyMode =3D true;
private boolean waiAutoAddMissingAttributes;
private int connectionTimeoutForProductionJob;
=
@@ -758,6 +759,7 @@
showTimeBasedPublishingIcons =3D getBoolean("showTimeBasedPubl=
ishingIcons", true);
localAccessUri =3D getString("localAccessUri", "http://localho=
st:8080");
developmentMode =3D getBoolean("developmentMode",true);
+ readOnlyMode =3D getBoolean("readOnlyMode",false);
tbpDisp =3D getBoolean("timebased_display",false);
aclDisp =3D getBoolean("aclDiff_display",false);
wflowDisp =3DgetBoolean("workflow_display",false);
@@ -1941,6 +1943,10 @@
return developmentMode;
}
=
+ public boolean isReadOnlyMode() {
+ return readOnlyMode;
+ } =
+ =
/**
* to get the Site errors page behavior
* @return a boolean
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/j=
ahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.skeleton&rev=3D18313&repna=
me=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/WEB-INF/etc/config/jahia.s=
keleton (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.s=
keleton Thu Aug 30 16:05:42 2007
@@ -803,6 +803,14 @@
# This setting can be used to deactivate development mode which flush
# the html cache each time you change the operation mode (live/edit)
developmentMode =3D false
+
+######################################################################
+### Read-only Mode #################################################
+######################################################################
+# This setting can be used to activate read-only mode, which will not
+# display the edit/admin tabs and links in the top admin bar
+readOnlyMode =3D false
+
######################################################################
### AES (Advanced Edition Settings) ##################################
######################################################################
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/err=
or_403.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/errors/error_403.jsp&rev=3D18313&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_403=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/errors/error_403=
.jsp Thu Aug 30 16:05:42 2007
@@ -14,24 +14,53 @@
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-8859-1"?><%
+--%>
+<[EMAIL PROTECTED] language=3D"java"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.exceptions.JahiaInvalidModeException"%>
+<[EMAIL PROTECTED] import=3D"java.text.MessageFormat"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.bin.Jahia" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ProcessingContext" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.usermanager.JahiaUser" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.data.JahiaData"%>
+<[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %>
+<?xml version=3D"1.0" encoding=3D"iso-8859-1"?><%
=
final String cpath =3D Jahia.getContextPath();
final String spath =3D Jahia.getServletPath();
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final int REDIRECTION_DELAY =3D 5000;
+ Throwable exception =3D (Throwable)request.getAttribute("originalExcep=
tion");
+ while (exception.getCause() !=3D null) {
+ exception =3D exception.getCause();
+ }
+ boolean isInvalidModeError =3D exception instanceof JahiaInvalidModeEx=
ception; =
=
%><!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";>
<head>
- <%@ page import=3D"org.jahia.bin.Jahia" %>
- <%@ page import=3D"org.jahia.params.ProcessingContext" %>
- <%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
- <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
- <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpForbidden.label"/></title>
<link rel=3D"stylesheet" href=3D"<%=3Drequest.getContextPath()%>/jsp/j=
ahia/engines/css/error.css" type=3D"text/css"/>
<script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%=
>/jsp/jahia/javascript/jahia.js"></script>
<script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%=
>/jsp/jahia/errors/error_include.js"></script>
+ =
+<%if (isInvalidModeError) { %>
+ <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.invalidMode.label"/></title>
+<script type=3D"text/javascript" language=3D"javascript">
+<!--
+ function redirectToPage() {
+ window.location.href =3D "<%=3DjParams.composeOperationUrl(ParamBean=
.NORMAL, null)%>";
+ } =
+
+ window.onload =3D function() {
+ setTimeout("redirectToPage()", <%=3DREDIRECTION_DELAY%>);
+ }
+ //-->
+ </script> =
+ <%} else {%>
+ <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpForbidden.label"/></title>
+ <%} %> =
</head>
<%
final JahiaUser currentUser =3D ((JahiaUser) session.getAttribute(Proc=
essingContext.SESSION_USER));
@@ -42,10 +71,20 @@
currentUserName =3D null;
}
boolean isGuest =3D currentUserName =3D=3D null || "guest".equals(curr=
entUserName);
+ =
%>
<body>
<br/><br/><br/>
-
+<% if (isInvalidModeError) { =
+ %>
+ <p class=3D"bold">
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDispl=
ay.invalidModeRequested.label"/>
+ <%=3DMessageFormat.format(JahiaResourceBundle.getEngineResource(
+ "org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label", jParams,
+ jParams.getLocale()), new Object[]{new Integer(REDIRECTION_DELAY =
/ 1000)})%>
+ </p> =
+ <% =
+} else { %>
<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
<tr>
<td colspan=3D"2" class=3D"boxtitlecolor1"><jahia:engineResourceBu=
ndle
@@ -87,6 +126,6 @@
</td>
</tr>
</table>
-
+<%} %>
</body>
</html>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/ope=
rationbuttons.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc&rev=3D18313&r=
epname=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/topbar/operation=
buttons.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/operation=
buttons.inc Thu Aug 30 16:05:42 2007
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%
-
+if (!jData.getProcessingContext().settings().isReadOnlyMode()) {
boolean writeAccess =3D false; =
boolean editModePermission =3D ServicesRegistry.getInstance().getJahia=
ACLManagerService().getSiteActionPermission("engines.actions.editMode", jPa=
rams.getUser(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0;
if (editModePermission) {
@@ -124,5 +124,6 @@
</div>
<%
}
- }
+ }
+} =
%>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/top=
menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.inc&rev=3D18313&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/topbar/topmenu.i=
nc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc Thu Aug 30 16:05:42 2007
@@ -102,19 +102,21 @@
<span>|</span><content:adminButton title=3D'<%=3DgetCommonResource("admini=
stration","administration",toploc)%>'/>
<%
}
-if (jData.gui().isEditMode()) {
-if (jData.page().checkWriteAccess(user)){
- PageBean pageBean =3D new PageBean(jData.page(),jParams);
+if (jData.gui().isEditMode() && !jData.getProcessingContext().settings().i=
sReadOnlyMode()) {
+ if (jData.page().checkWriteAccess(user)){
+ PageBean pageBean =3D new PageBean(jData.page(),jParams);
%>
<span>|</span>
<%
- jData.gui().html().drawBeginActionMenu(pageBean , null, null, false, =
"", "jahiatemplates.common", "pageSettings", out);
- }
- }
-if (!jData.gui().isNormalMode()){
-if (jData.page().checkWriteAccess(user,true)
- || (jData.page().checkAdminAccess(user,true) && jData.page().check=
ReadAccess(user))
- ) {
+ jData.gui().html().drawBeginActionMenu(pageBean , null, null, false, "=
", "jahiatemplates.common", "pageSettings", out);
+ }
+}
+
+if (!jData.gui().isNormalMode() && !jData.getProcessingContext().settings(=
).isReadOnlyMode()){
+ =
+ if (jData.page().checkWriteAccess(user, true)
+ || (jData.page().checkAdminAccess(user, true) && jData.page().checkR=
eadAccess(user))) {
+ =
Vector languageSettings =3D jParams.getSite().getLanguageSetti=
ngs();
if (languageSettings.size() > 0) {
%>
@@ -182,15 +184,16 @@
}
}//end while
}
- }
}
+}
=
- if (jData.getProcessingContext().settings().isEsiCacheActivated()) { %>
+if (jData.getProcessingContext().settings().isEsiCacheActivated()) { %>
<span>|</span>
<img src=3D"<content:serverHttpPath />/jsp/jahia/engines/images/esi_invali=
date_page.gif" alt=3D"<content:resourceBundle resourceBundle=3D'jahiatempla=
tes.common' resourceName=3D'esiInvalidatePage' defaultValue=3D'Regenerate t=
he current page in the ESI Cache Server'/>" border=3D"0" onClick=3D"esiGene=
ratePageInvalidationUrl()"/>
<%
-}
-if(jData.gui().isEditMode()){
+}
+
+if(jData.gui().isEditMode() && !jData.getProcessingContext().settings().is=
ReadOnlyMode()){
// clipboard display
if (request.getSession().getAttribute("clipboard_key")!=3Dnull) {
%>
@@ -198,10 +201,11 @@
<% } else { %>
<span><img id=3D"clipboard" name=3D"" src=3D"<content:serverHttpPath />/=
jsp/jahia/engines/images/pix.gif" width=3D"16" height=3D"16" alt=3D"Clipboa=
rd :vide" border=3D"0"/></span>
<% }
-}
- // ajax libs and advanced edit settings include
- String path =3D request.getContextPath();//jahia path used in subseque=
nt includes
- if(jData.gui().isEditMode()){
+}
+
+// ajax libs and advanced edit settings include
+String path =3D request.getContextPath();//jahia path used in subsequent i=
ncludes
+if(jData.gui().isEditMode() && !jData.getProcessingContext().settings().is=
ReadOnlyMode()){
%>
<%@ include file=3D"aes.inc" %>
=
@@ -216,6 +220,6 @@
</span>
<!--end topmenu mods-->
</div>
-<% } %>
-
-
+<%
+}
+%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
