Author: ddewolf
Date: Wed Nov 1 09:16:58 2006
New Revision: 469987
URL: http://svn.apache.org/viewvc?view=rev&rev=469987
Log:
Extracting jsp helper method so that it can be used within the tags as well.
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
(with props)
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java?view=diff&rev=469987&r1=469986&r2=469987
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
Wed Nov 1 09:16:58 2006
@@ -43,25 +43,7 @@
private static final Log LOG =
LogFactory.getLog(JspTilesRequestContext.class);
- /**
- * JSP 2.0 include method to use which supports configurable flushing.
- */
- private static Method include = null;
- /**
- * Initialize the include variable with the
- * JSP 2.0 method if available.
- */
- static {
- try {
- // get version of include method with flush argument
- Class[] args = new Class[]{String.class, boolean.class};
- include = PageContext.class.getMethod("include", args);
- } catch (NoSuchMethodException e) {
- LOG.debug("Could not find JSP 2.0 include method. Using old one
that doesn't support " +
- "configurable flushing.", e);
- }
- }
private PageContext pageContext;
@@ -96,20 +78,7 @@
* @throws java.io.IOException - Thrown by call to
pageContext.include()
*/
public void include(String path, boolean flush) throws IOException,
ServletException {
-
- try {
- // perform include with new JSP 2.0 method that supports flushing
- if (include != null) {
- include.invoke(pageContext, path, flush);
- return;
- }
- } catch (IllegalAccessException e) {
- LOG.debug("Could not find JSP 2.0 include method. Using old
one.", e);
- } catch (InvocationTargetException e) {
- LOG.debug("Unable to execute JSP 2.0 include method. Trying old
one.", e);
- }
-
- pageContext.include(path);
+ JspUtil.doInclude(pageContext, path, flush);
}
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java?view=auto&rev=469987
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
(added)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
Wed Nov 1 09:16:58 2006
@@ -0,0 +1,76 @@
+/*
+ * $Id$
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+package org.apache.tiles.context.jsp;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.jsp.PageContext;
+import javax.servlet.ServletException;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.io.IOException;
+
+/**
+ * Utility class for working within a Jsp environment.
+ */
+public class JspUtil {
+
+ private static final Log LOG =
+ LogFactory.getLog(JspUtil.class);
+
+ /**
+ * JSP 2.0 include method to use which supports configurable flushing.
+ */
+ private static Method include = null;
+
+ /**
+ * Initialize the include variable with the
+ * JSP 2.0 method if available.
+ */
+ static {
+ try {
+ // get version of include method with flush argument
+ Class[] args = new Class[]{String.class, boolean.class};
+ include = PageContext.class.getMethod("include", args);
+ } catch (NoSuchMethodException e) {
+ LOG.debug("Could not find JSP 2.0 include method. Using old one
that doesn't support " +
+ "configurable flushing.", e);
+ }
+ }
+
+ public static void doInclude(PageContext pageContext, String uri, boolean
flush)
+ throws IOException, ServletException {
+
+ try {
+ // perform include with new JSP 2.0 method that supports flushing
+ if (include != null) {
+ include.invoke(pageContext, uri, flush);
+ return;
+ }
+ } catch (IllegalAccessException e) {
+ LOG.debug("Could not find JSP 2.0 include method. Using old
one.", e);
+ } catch (InvocationTargetException e) {
+ LOG.debug("Unable to execute JSP 2.0 include method. Trying old
one.", e);
+ }
+
+ pageContext.include(uri);
+ }
+
+
+}
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
------------------------------------------------------------------------------
svn:keywords = Id Author Date Rev
