dpillot 2005/09/20 18:31:22 CEST
Modified files:
core/src/webapp/jsp/jahia/engines engine.jsp
Log:
bug fix
Revision Changes Path
1.10 +120 -95 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.9&r2=1.10&f=h
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- engine.jsp 19 Sep 2005 16:43:29 -0000 1.9
+++ engine.jsp 20 Sep 2005 16:31:21 -0000 1.10
@@ -1,8 +1,8 @@
-<[EMAIL PROTECTED] language = "java"%>
-<[EMAIL PROTECTED] import = "java.util.*"%>
-<[EMAIL PROTECTED] import="org.jahia.params.*" %>
-<%@ page import="org.apache.log4j.Logger"%>
-<%@ page import="org.apache.log4j.Priority"%>
+<%@ page language="java" %>
+<%@ page import="java.util.*" %>
+<%@ page import="org.jahia.params.*" %>
+<%@ page import="org.apache.log4j.Logger" %>
+<%@ page import="org.apache.log4j.Level"%>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%@ taglib uri="jahiaHtmlLib" prefix="jahiaHtml" %>
@@ -11,8 +11,8 @@
<%-- Don't cache the engines with ESI: --%>
<jesi:control cache="no"/>
-<jahia:i18n />
-<jahiaHtml:initDynButton buttonFile="WEB-INF/etc/button/button.xml" />
+<jahia:i18n/>
+<jahiaHtml:initDynButton buttonFile="WEB-INF/etc/button/button.xml"/>
<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
<jsp:useBean id="serverURL" class="java.lang.String" scope="request"/>
@@ -21,127 +21,137 @@
<jsp:useBean id="jspSource" class="java.lang.String" scope="request"/>
<%
/**
- * @version $Id: engine.jsp,v 1.9 2005/09/19 16:43:29 dpillot Exp $
+ * @version $Id: engine.jsp,v 1.10 2005/09/20 16:31:21 dpillot Exp $
*/
//logger
- Logger logger=Logger.getLogger(this.getClass());
+ Logger logger = Logger.getLogger(this.getClass());
// include pages
Properties includes = new Properties();
// shared jsp
- includes.setProperty( "close",
"/jsp/jahia/engines/shared/close.jsp");
- includes.setProperty( "cancel",
"/jsp/jahia/engines/shared/cancel.jsp");
- includes.setProperty( "apply",
"/jsp/jahia/engines/shared/apply.jsp");
- includes.setProperty( "not_editable_field",
"/jsp/jahia/engines/shared/not_editable_field.jsp");
+ includes.setProperty("close", "/jsp/jahia/engines/shared/close.jsp");
+ includes.setProperty("cancel", "/jsp/jahia/engines/shared/cancel.jsp");
+ includes.setProperty("apply", "/jsp/jahia/engines/shared/apply.jsp");
+ includes.setProperty("not_editable_field",
"/jsp/jahia/engines/shared/not_editable_field.jsp");
// login engine
- includes.setProperty( "login",
"/jsp/jahia/engines/login/login.jsp");
- includes.setProperty( "bad_login",
"/jsp/jahia/engines/login/badlogin.jsp");
- includes.setProperty( "login_close",
"/jsp/jahia/engines/login/close.jsp");
+ includes.setProperty("login", "/jsp/jahia/engines/login/login.jsp");
+ includes.setProperty("bad_login",
"/jsp/jahia/engines/login/badlogin.jsp");
+ includes.setProperty("login_close",
"/jsp/jahia/engines/login/close.jsp");
// page properties engine
- includes.setProperty( "page_properties",
"/jsp/jahia/engines/pages/pageproperties.jsp");
+ includes.setProperty("page_properties",
"/jsp/jahia/engines/pages/pageproperties.jsp");
// update field engine
- includes.setProperty( "update_field",
"/jsp/jahia/engines/updatefield/updatefield.jsp");
+ includes.setProperty("update_field",
"/jsp/jahia/engines/updatefield/updatefield.jsp");
// add container engine
- includes.setProperty( "add_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
+ includes.setProperty("add_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
// update container engine
- includes.setProperty( "update_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
+ includes.setProperty("update_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
// delete container engine
- includes.setProperty( "delete_container",
"/jsp/jahia/engines/deletecontainer/deletecontainer.jsp");
+ includes.setProperty("delete_container",
"/jsp/jahia/engines/deletecontainer/deletecontainer.jsp");
// container list properties
- includes.setProperty( "container_list_properties",
"/jsp/jahia/engines/containerlistproperties/containerlistproperties.jsp");
+ includes.setProperty("container_list_properties",
"/jsp/jahia/engines/containerlistproperties/containerlistproperties.jsp");
// rights engine
- includes.setProperty( "manage_rights",
"/jsp/jahia/engines/rights/managerights.jsp");
- includes.setProperty( "manage_rights_close",
"/jsp/jahia/engines/rights/close.jsp");
+ includes.setProperty("manage_rights",
"/jsp/jahia/engines/rights/managerights.jsp");
+ includes.setProperty("manage_rights_close",
"/jsp/jahia/engines/rights/close.jsp");
// templates engine
- includes.setProperty( "manage_template",
"/jsp/jahia/engines/template/template.jsp");
+ includes.setProperty("manage_template",
"/jsp/jahia/engines/template/template.jsp");
// select page engine
- includes.setProperty( "select_page",
"/jsp/jahia/engines/selectpage/select_page.jsp");
- includes.setProperty( "selectPage_close",
"/jsp/jahia/engines/selectpage/close.jsp");
+ includes.setProperty("select_page",
"/jsp/jahia/engines/selectpage/select_page.jsp");
+ includes.setProperty("selectPage_close",
"/jsp/jahia/engines/selectpage/close.jsp");
// filemanager engine
- includes.setProperty( "filemanager",
"/jsp/jahia/engines/filemanager/filemanager.jsp");
- includes.setProperty( "filemanager_fileupload",
"/jsp/jahia/engines/filemanager/fileupload.jsp");
- includes.setProperty(
"filemanager_fileuploadconfirm","/jsp/jahia/engines/filemanager/fileuploadconfirm.jsp");
- includes.setProperty( "filemanager_filedelete",
"/jsp/jahia/engines/filemanager/filedelete.jsp");
- includes.setProperty( "filemanager_fileusage",
"/jsp/jahia/engines/filemanager/fileusage.jsp");
- includes.setProperty( "filemanager_filerename",
"/jsp/jahia/engines/filemanager/filerename.jsp");
- includes.setProperty( "filemanager_error",
"/jsp/jahia/engines/filemanager/error.jsp");
- includes.setProperty( "filemanager_close",
"/jsp/jahia/engines/filemanager/close.jsp");
- includes.setProperty( "filemanager_reloadpage",
"/jsp/jahia/engines/filemanager/reloadpage.jsp");
- includes.setProperty( "filemanager_view",
"/jsp/jahia/engines/filemanager/view.jsp");
- includes.setProperty( "filemanager_fileedit",
"/jsp/jahia/engines/filemanager/fileedit.jsp");
- includes.setProperty( "filemanager_createdir",
"/jsp/jahia/engines/filemanager/createdir.jsp");
- includes.setProperty( "filemanager_migration",
"/jsp/jahia/engines/filemanager/migration.jsp");
-
- includes.setProperty( "selectUG",
"/jsp/jahia/engines/users/selectUG.jsp");
- includes.setProperty( "selectusers_close",
"/jsp/jahia/engines/users/close.jsp");
- includes.setProperty( "edituserpreferences",
"/jsp/jahia/engines/users/editUserPreferences.jsp");
+ includes.setProperty("filemanager",
"/jsp/jahia/engines/filemanager/filemanager.jsp");
+ includes.setProperty("filemanager_fileupload",
"/jsp/jahia/engines/filemanager/fileupload.jsp");
+ includes.setProperty("filemanager_fileuploadconfirm",
"/jsp/jahia/engines/filemanager/fileuploadconfirm.jsp");
+ includes.setProperty("filemanager_filedelete",
"/jsp/jahia/engines/filemanager/filedelete.jsp");
+ includes.setProperty("filemanager_fileusage",
"/jsp/jahia/engines/filemanager/fileusage.jsp");
+ includes.setProperty("filemanager_filerename",
"/jsp/jahia/engines/filemanager/filerename.jsp");
+ includes.setProperty("filemanager_error",
"/jsp/jahia/engines/filemanager/error.jsp");
+ includes.setProperty("filemanager_close",
"/jsp/jahia/engines/filemanager/close.jsp");
+ includes.setProperty("filemanager_reloadpage",
"/jsp/jahia/engines/filemanager/reloadpage.jsp");
+ includes.setProperty("filemanager_view",
"/jsp/jahia/engines/filemanager/view.jsp");
+ includes.setProperty("filemanager_fileedit",
"/jsp/jahia/engines/filemanager/fileedit.jsp");
+ includes.setProperty("filemanager_createdir",
"/jsp/jahia/engines/filemanager/createdir.jsp");
+ includes.setProperty("filemanager_migration",
"/jsp/jahia/engines/filemanager/migration.jsp");
+
+ includes.setProperty("selectUG",
"/jsp/jahia/engines/users/selectUG.jsp");
+ includes.setProperty("selectusers_close",
"/jsp/jahia/engines/users/close.jsp");
+ includes.setProperty("edituserpreferences",
"/jsp/jahia/engines/users/editUserPreferences.jsp");
- includes.setProperty( "versioning",
"/jsp/jahia/engines/versioning/versioning.jsp");
+ includes.setProperty("versioning",
"/jsp/jahia/engines/versioning/versioning.jsp");
- includes.setProperty( "advworkflow",
"/jsp/jahia/engines/workflow/adv_workflow.jsp");
- includes.setProperty( "workflow",
"/jsp/jahia/engines/workflow/workflow.jsp");
+ includes.setProperty("advworkflow",
"/jsp/jahia/engines/workflow/adv_workflow.jsp");
+ includes.setProperty("workflow",
"/jsp/jahia/engines/workflow/workflow.jsp");
- includes.setProperty( "lock",
"/jsp/jahia/engines/lock/lock.jsp");
+ includes.setProperty("lock", "/jsp/jahia/engines/lock/lock.jsp");
// metadata engine
- includes.setProperty( "metadata_engine",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
+ includes.setProperty("metadata_engine",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
- includes.setProperty( "mysettings",
"/jsp/jahia/engines/mysettings/mysettings.jsp");
+ includes.setProperty("mysettings",
"/jsp/jahia/engines/mysettings/mysettings.jsp");
- includes.setProperty( "contentdefinition_forward",
"/views/engines/contentdefinition/index.jsp");
+ includes.setProperty("contentdefinition_forward",
"/views/engines/contentdefinition/index.jsp");
- includes.setProperty( "timebasedpublishing_engine",
"/jsp/jahia/engines/timebasedpublishing/timebasedpublishing.jsp");
+ includes.setProperty("timebasedpublishing_engine",
"/jsp/jahia/engines/timebasedpublishing/timebasedpublishing.jsp");
- request.setAttribute( "includes",includes);
+ request.setAttribute("includes", includes);
- HashMap engineMap =
(HashMap)request.getAttribute("org.jahia.engines.EngineHashMap");
- String engineUrl = (String) engineMap.get( "engineUrl" );
- String URLSep = (engineUrl.indexOf("?") == -1) ? "?" : "&" ;
- String includePage = includes.getProperty(jspSource);
- ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
- String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
- String theScreen = (String)engineMap.get("screen");
+ HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
+ String engineUrl = (String) engineMap.get("engineUrl");
+ String URLSep = (engineUrl.indexOf("?") == -1) ? "?" : "&";
+ String includePage = includes.getProperty(jspSource);
+ ParamBean jParams = (ParamBean)
request.getAttribute("org.jahia.params.ParamBean");
+ String theURL = (String) jParams.settings().getJahiaEnginesHttpPath();
+ String theScreen = (String) engineMap.get("screen");
%>
<html>
<head>
<title>Jahia - <%=engineTitle%></title>
-<link rel="stylesheet"
href="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.stylesheet.css"/>" type="text/css">
+<link rel="stylesheet"
+ href="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.stylesheet.css"/>"
+ type="text/css">
<style type="text/css">
-<!--
-.onglet{
- padding-right: 5px;
- padding-left: 5px;
- color: #ffffff;
-}
+ <!--
+ .onglet {
+ padding-right: 5px;
+ padding-left: 5px;
+ color: #ffffff;
+ }
-.ongleton {
- padding-right: 5px;
- padding-left: 5px;
- font-weight:bolder;
- color: #000000;
-}
--->
+ .ongleton {
+ padding-right: 5px;
+ padding-left: 5px;
+ font-weight: bolder;
+ color: #000000;
+ }
+
+ -->
</style>
+
+<!-- dwr scripts -->
+<script type='text/javascript' src='/jahia/dwr/engine.js'></script>
+<script type='text/javascript'
src='/jahia/dwr/interface/ajaxTest.js'></script>
+<script type='text/javascript' src='/jahia/dwr/util.js'></script>
+<!--end dwr scripts -->
+
<script language="javascript" src="<%=javaScriptPath%>"></script>
<script language="javascript"
src="<%=URL%>../javascript/formWrapper.js"></script>
<script type="text/javascript"
src="<%=URL%>../javascript/serverdatetime.js"></script>
<% if (request.getAttribute("org.jahia.engines.html.headers") != null) {
%><%= (String) request.getAttribute("org.jahia.engines.html.headers") %><%
- } %>
+ } %>
<script language="javascript">
<!--
@@ -351,45 +361,60 @@
</table>
<br>
<!-- include page start -->
-<% if ( includePage != null && jspSource.endsWith("_forward") ){ %>
+<% if (includePage != null && jspSource.endsWith("_forward")) { %>
<!-- forwarding -->
-<jsp:forward page="<%=includePage%>" />
+<jsp:forward page="<%=includePage%>"/>
<% } else { %>
<!-- including -->
<jsp:include page="<%=includePage%>" flush="true"/>
<% } %>
<%
// debugging stuff - joe
- if(logger!=null
&&logger.getEffectiveLevel().isGreaterOrEqual(Priority.DEBUG)) {
- logger.debug(includePage+":jsp debugging enabled");
- StringBuffer debugSB=new StringBuffer();
- Object o;
- try{
- for(Iterator ite=engineMap.keySet().iterator();ite.hasNext();){
- o=ite.next();
- debugSB.append("<b>");
- debugSB.append(o);
- debugSB.append(":</b> ");
- debugSB.append(engineMap.get(o));
+ /**
+ * put this in your log4j xml file if u need debug in jsp, type:
+ * <!-- jsps engines -->
+ * <category name="org.apache.jsp.jsp.jahia.engines">
+ * <priority value="debug"/>
+ * </category>
+ */
+
+ if (!logger.getEffectiveLevel().isGreaterOrEqual(Level.DEBUG)) {
+ logger.debug(includePage + ":jsp debugging enabled" +
logger.getEffectiveLevel());
+
+ StringBuffer debugSB = new StringBuffer();
+ String msg="<h2>DEBUG JSP["+logger.getEffectiveLevel()+"]</h2>";
+ debugSB.append(msg);
debugSB.append("<br>");
- }
- } catch(Exception e){
+ Object o;
+ try {
+ for (Iterator ite = engineMap.keySet().iterator();
ite.hasNext();) {
+ o = ite.next();
+ debugSB.append("<b>");
+ debugSB.append(o);
+ debugSB.append(":</b> ");
+ debugSB.append(engineMap.get(o));
+ debugSB.append("<br>");
+ }
+ } catch (Exception e) {
debugSB.append(e);
}
%>
<%=debugSB%>
<%
-}
+ }
%>
<!-- include page ends -->
</body>
</html>
<%
-/**
- * $Log: engine.jsp,v $
- * Revision 1.9 2005/09/19 16:43:29 dpillot
- * added debugging capabilities in engine jsps
- *
- *
-*/
+ /**
+ * $Log: engine.jsp,v $
+ * Revision 1.10 2005/09/20 16:31:21 dpillot
+ * bug fix
+ *
+ * Revision 1.9 2005/09/19 16:43:29 dpillot
+ * added debugging capabilities in engine jsps
+ *
+ *
+ */
%>
\ No newline at end of file
