Author: apetrelli
Date: Mon Nov 9 20:42:15 2009
New Revision: 834219
URL: http://svn.apache.org/viewvc?rev=834219&view=rev
Log:
TILESSB-12
Organized tiles-jsp to prepare to move code to tiles-request.
Added:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java
- copied, changed from r834216,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
Removed:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
Copied:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java
(from r834216,
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java?p2=tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java&p1=tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java&r1=834216&r2=834219&rev=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java
Mon Nov 9 20:42:15 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.jsp.context;
+package org.apache.tiles.jsp;
import java.io.IOException;
import java.io.StringWriter;
@@ -72,37 +72,6 @@
}
/**
- * Returns true if forced include of the result is needed.
- *
- * @param context The page context.
- * @return If <code>true</code> the include operation must be forced.
- * @since 2.0.6
- */
- public static boolean isForceInclude(JspContext context) {
- Boolean retValue = (Boolean) context
- .getAttribute(
-
org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
- PageContext.REQUEST_SCOPE);
- return retValue != null && retValue.booleanValue();
- }
-
- /**
- * Sets the option that enables the forced include of the response.
- *
- * @param context The page context.
- * @param forceInclude If <code>true</code> the include operation must be
- * forced.
- * @since 2.0.6
- */
- public static void setForceInclude(JspContext context, boolean
forceInclude) {
- Boolean retValue = Boolean.valueOf(forceInclude);
- context
- .setAttribute(
-
org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
- retValue,
PageContext.REQUEST_SCOPE);
- }
-
- /**
* Returns the default Tiles container.
*
* @param context The page context to use.
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
Mon Nov 9 20:42:15 2009
@@ -77,7 +77,11 @@
/** {...@inheritdoc} */
@Override
public void include(String path) throws IOException {
- JspUtil.setForceInclude(pageContext, true);
+ Boolean retValue = Boolean.valueOf(true);
+ pageContext
+ .setAttribute(
+
org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
+ retValue,
PageContext.REQUEST_SCOPE);
try {
pageContext.include(path, false);
} catch (ServletException e) {
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.AddAttributeModel;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.AddListAttributeModel;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
Mon Nov 9 20:42:15 2009
@@ -28,7 +28,7 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.Attribute;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.DefaultAttributeResolver;
import org.apache.tiles.template.GetAsStringModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -26,7 +26,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.ImportAttributeModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -28,7 +28,7 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.Attribute;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.DefaultAttributeResolver;
import org.apache.tiles.template.InsertAttributeModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.InsertDefinitionModel;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.InsertTemplateModel;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.PutAttributeModel;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.PutListAttributeModel;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
Mon Nov 9 20:42:15 2009
@@ -31,7 +31,7 @@
import javax.servlet.jsp.tagext.TagExtraInfo;
import javax.servlet.jsp.tagext.VariableInfo;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.template.ImportAttributeModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
Mon Nov 9 20:42:15 2009
@@ -27,7 +27,7 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.jsp.taglib.TilesJspException;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.template.DefinitionModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
Mon Nov 9 20:42:15 2009
@@ -24,7 +24,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
-import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.JspUtil;
/**
* Sets the current container, to be used by Tiles tags.
Modified:
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java?rev=834219&r1=834218&r2=834219&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
Mon Nov 9 20:42:15 2009
@@ -29,6 +29,7 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.jsp.JspUtil;
import org.apache.tiles.jsp.taglib.TilesJspException;
import org.apache.tiles.servlet.context.ServletUtil;
import org.easymock.classextension.EasyMock;
