mcardle 2005/12/06 15:39:43 CET
Modified files:
core/src/conf/java JahiaAdministrationResources.properties
JahiaAdministrationResources_fr.properties
core/src/webapp/html/startup howto_esi.html
core/src/webapp/jsp/jahia/administration status.jsp
Log:
* adds ESI webcache access to admin menu
Revision Changes Path
1.21 +3 -0
jahia/core/src/conf/java/JahiaAdministrationResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaAdministrationResources.properties.diff?r1=1.20&r2=1.21&f=h
1.21 +3 -0
jahia/core/src/conf/java/JahiaAdministrationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaAdministrationResources_fr.properties.diff?r1=1.20&r2=1.21&f=h
1.9 +2 -1 jahia/core/src/webapp/html/startup/howto_esi.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/html/startup/howto_esi.html.diff?r1=1.8&r2=1.9&f=h
1.9 +34 -0 jahia/core/src/webapp/jsp/jahia/administration/status.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/status.jsp.diff?r1=1.8&r2=1.9&f=h
Index: JahiaAdministrationResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaAdministrationResources.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JahiaAdministrationResources.properties 25 Nov 2005 16:40:39 -0000
1.20
+++ JahiaAdministrationResources.properties 6 Dec 2005 14:39:42 -0000
1.21
@@ -496,6 +496,9 @@
org.jahia.admin.status.ManageStatus.successfulHits.label = Successful cache
hits
org.jahia.admin.status.ManageStatus.totalHits.label = total
org.jahia.admin.status.ManageStatus.efficiency.label = Efficiency
+org.jahia.admin.status.ManageStatus.esiServer.heading.label = Remote ESI
WebCache(s) Control Panel
+org.jahia.admin.status.ManageStatus.esiServer.server.label = Server
+org.jahia.admin.status.ManageStatus.esiServer.view.label = Access
org.jahia.admin.switchAdminModeTo.label= switch administration mode to
org.jahia.admin.templates.ManageTemplates.automaticDeployment.label=
Automatic Deployment Mode
org.jahia.admin.templates.ManageTemplates.available.label= Available
Index: JahiaAdministrationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaAdministrationResources_fr.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JahiaAdministrationResources_fr.properties 28 Nov 2005 17:33:39
-0000 1.20
+++ JahiaAdministrationResources_fr.properties 6 Dec 2005 14:39:42
-0000 1.21
@@ -581,6 +581,9 @@
org.jahia.admin.status.ManageStatus.successfulHits.label = Trouvé
dans le cache
org.jahia.admin.status.ManageStatus.totalHits.label = total
org.jahia.admin.status.ManageStatus.efficiency.label = Efficacité
+org.jahia.admin.status.ManageStatus.esiServer.heading.label = Panneaux de
bord des WebCaches ESI distants
+org.jahia.admin.status.ManageStatus.esiServer.server.label = Serveur
+org.jahia.admin.status.ManageStatus.esiServer.view.label = Configurer
org.jahia.admin.switchAdminModeTo.label=Accéder à
l'administration du
org.jahia.admin.templates.ManageTemplates.automaticDeployment.label=Mode de
déploiement automatique
org.jahia.admin.templates.ManageTemplates.available.label=Disponible
Index: howto_esi.html
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/html/startup/howto_esi.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- howto_esi.html 5 Dec 2005 16:50:43 -0000 1.8
+++ howto_esi.html 6 Dec 2005 14:39:42 -0000 1.9
@@ -224,7 +224,8 @@
You can also activate debug
mode on the ESI server by replacing "info" values by "debug" in
\YOUR_ESI_DIR\tomcat\webapps\ROOT\WEB-INF\log4j.xml. You will need to restart
the ESI server
for any changes to be taken
into account. <br/></li>
- <li> To access the
administration page of the ESI server, please go to
http://YOUR_ESI_SERVER_IP:8081/esiadmin/index.jsp <br/></li>
+ <li> To access the
administration page of the ESI server, please go to http://<span
class="style1">YOUR_ESI_SERVER_IP</span>:8081/esiadmin/index.jsp or go to
"Server and Cache Status" section in Jahia's administration menu.
<br/>
+ </li>
</ol>
</p>Note: In this example config, we used port 8080 for the Jahia server
and 8081 for the ESI server. However, you can change this to any suitable port
combination by first changing the server.xml in Jahia's and ESI's
\tomcat\conf\server.xml files. <br/>
<br/>
Index: status.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/status.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- status.jsp 25 Nov 2005 16:41:13 -0000 1.8
+++ status.jsp 6 Dec 2005 14:39:42 -0000 1.9
@@ -6,6 +6,9 @@
<[EMAIL PROTECTED] import = "org.jahia.services.cache.Cache" %>
<[EMAIL PROTECTED] import = "org.jahia.services.cache.CacheFactory" %>
<[EMAIL PROTECTED] import = "org.jahia.services.database.*" %>
+<%@ page import="org.jahia.settings.SettingsBean"%>
+<%@ page import="org.jahia.params.ProcessingContext"%>
+<%@ page import="org.jahia.services.esi.EsiInvalidation"%>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<jahia:i18n />
@@ -148,6 +151,37 @@
</table>
<!-- End of new database connection dispenser statistics -->
+
+<!-- BEGIN - ESI server control panel access -->
+<%
+ JahiaData jData = (JahiaData)
request.getAttribute("org.jahia.data.JahiaData");
+ ProcessingContext jParams = null;
+ if (jData != null) {
+ jParams = jData.getProcessingContext();
+ }
+
+ if (jParams.settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)) {
+%>
+ <br>
+ <span class="text"><strong> <jahia:adminResourceBundle
resourceName="org.jahia.admin.status.ManageStatus.esiServer.heading.label"/></strong></span>
+ <br>
+ <br>
+ <table align="center" border="1" cellspacing="0" cellpadding="5"
class="text" width="90%">
+ <%
+ for (int i = 0; i < EsiInvalidation.EsiServerIPs.length; i++) {
+ %>
+ <tr>
+ <td width="100%"><jahia:adminResourceBundle
resourceName="org.jahia.admin.status.ManageStatus.esiServer.server.label"/>
#<%=i+1%> -
<%=EsiInvalidation.EsiServerIPs[i]+":"+EsiInvalidation.EsiServerPorts[i]%></td>
+ <td align="right"><a
href="http://<%=EsiInvalidation.EsiServerIPs[i]+":"+EsiInvalidation.EsiServerPorts[i]%>/esiadmin/index.jsp"><jahia:adminResourceBundle
resourceName="org.jahia.admin.status.ManageStatus.esiServer.view.label"/></a>
</td>
+ </tr>
+<% %> <% } %>
+ </table>
+<%
+ }
+%>
+<!-- END - ESI server control panel access -->
+
+
<br>
<table align="center" border="0" cellspacing="0" cellpadding="5"
class="text" width="90%">
<tr>
