roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r502689 - in /incubator/roller/trunk/web/WEB-INF/jsps: 403.jsp 404.jsp error.jsp
Date Fri, 02 Feb 2007 18:47:51 GMT
Author: agilliland
Date: Fri Feb  2 10:47:50 2007
New Revision: 502689

URL: http://svn.apache.org/viewvc?view=rev&rev=502689
Log:
error pages can't use taglibs.jsp because taglibs.jsp can require a db session and something
about the way the error pages are triggered causes db sessions to not always be closed properly.


Modified:
    incubator/roller/trunk/web/WEB-INF/jsps/403.jsp
    incubator/roller/trunk/web/WEB-INF/jsps/404.jsp
    incubator/roller/trunk/web/WEB-INF/jsps/error.jsp

Modified: incubator/roller/trunk/web/WEB-INF/jsps/403.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/403.jsp?view=diff&rev=502689&r1=502688&r2=502689
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/403.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/403.jsp Fri Feb  2 10:47:50 2007
@@ -1,4 +1,4 @@
-<!--
+<%--
   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,8 +14,44 @@
   limitations under the License.  For additional information regarding
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
--->
-<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
+--%><%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"   prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"   prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic"  prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles"  prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
+
+<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
+
+<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
+
+<%@ page import="org.apache.roller.business.Roller" %>
+<%@ page import="org.apache.roller.business.RollerFactory" %>
+
+<%@ page import="org.apache.roller.pojos.UserData" %>
+<%@ page import="org.apache.roller.pojos.WebsiteData" %>
+<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
+
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+
+<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerContext" %>
+<%@ page import="org.apache.roller.ui.core.RollerSession" %>
+
+<%   
+    request.setAttribute("mLocale", request.getLocale());
+%>
+<fmt:setLocale value="${mLocale}" />
+<fmt:setBundle basename="ApplicationResources" />
+
+<%-- Set Struts tags to use XHTML --%>
+<html:xhtml />
 <%@ page isErrorPage="true" %>
 <tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
    <tiles:put name="banner"       value="/WEB-INF/jsps/tiles/banner.jsp" />

Modified: incubator/roller/trunk/web/WEB-INF/jsps/404.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/404.jsp?view=diff&rev=502689&r1=502688&r2=502689
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/404.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/404.jsp Fri Feb  2 10:47:50 2007
@@ -1,4 +1,4 @@
-<!--
+<%--
   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,8 +14,44 @@
   limitations under the License.  For additional information regarding
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
--->
-<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
+--%><%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"   prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"   prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic"  prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles"  prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
+
+<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
+
+<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
+
+<%@ page import="org.apache.roller.business.Roller" %>
+<%@ page import="org.apache.roller.business.RollerFactory" %>
+
+<%@ page import="org.apache.roller.pojos.UserData" %>
+<%@ page import="org.apache.roller.pojos.WebsiteData" %>
+<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
+
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+
+<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerContext" %>
+<%@ page import="org.apache.roller.ui.core.RollerSession" %>
+
+<%   
+    request.setAttribute("mLocale", request.getLocale());
+%>
+<fmt:setLocale value="${mLocale}" />
+<fmt:setBundle basename="ApplicationResources" />
+
+<%-- Set Struts tags to use XHTML --%>
+<html:xhtml />
 <%@ page isErrorPage="true" %>
 <tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
    <tiles:put name="banner"       value="/WEB-INF/jsps/tiles/banner.jsp" />

Modified: incubator/roller/trunk/web/WEB-INF/jsps/error.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/error.jsp?view=diff&rev=502689&r1=502688&r2=502689
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/error.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/error.jsp Fri Feb  2 10:47:50 2007
@@ -1,4 +1,4 @@
-<!--
+<%--
   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,8 +14,44 @@
   limitations under the License.  For additional information regarding
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
--->
-<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
+--%><%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"   prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"   prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic"  prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles"  prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
+
+<%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
+
+<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
+
+<%@ page import="org.apache.roller.business.Roller" %>
+<%@ page import="org.apache.roller.business.RollerFactory" %>
+
+<%@ page import="org.apache.roller.pojos.UserData" %>
+<%@ page import="org.apache.roller.pojos.WebsiteData" %>
+<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
+
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+
+<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerContext" %>
+<%@ page import="org.apache.roller.ui.core.RollerSession" %>
+
+<%   
+    request.setAttribute("mLocale", request.getLocale());
+%>
+<fmt:setLocale value="${mLocale}" />
+<fmt:setBundle basename="ApplicationResources" />
+
+<%-- Set Struts tags to use XHTML --%>
+<html:xhtml />
 <%@ page isErrorPage="true" %>
 <tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
    <tiles:put name="banner"       value="/WEB-INF/jsps/tiles/banner.jsp" />



Mime
View raw message