Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java Tue Aug 4 20:05:31 2009 @@ -17,10 +17,11 @@ package org.apache.struts2.jasper.runtime; +import org.apache.struts2.jasper.Constants; + +import javax.servlet.ServletConfig; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; -import javax.servlet.ServletConfig; -import org.apache.struts2.jasper.Constants; /** * Pool of tag handlers that can be reused.
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JasperLoader.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JasperLoader.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JasperLoader.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JasperLoader.java Tue Aug 4 20:05:31 2009 @@ -17,6 +17,8 @@ package org.apache.struts2.jasper.servlet; +import org.apache.struts2.jasper.Constants; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -24,8 +26,6 @@ import java.security.CodeSource; import java.security.PermissionCollection; -import org.apache.struts2.jasper.Constants; - /** * Class loader for loading servlet class files (corresponding to JSP files) * and tag handler class files (corresponding to tag files). Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java Tue Aug 4 20:05:31 2009 @@ -20,21 +20,16 @@ import com.opensymphony.xwork2.util.finder.ClassLoaderInterface; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import java.io.File; import java.io.InputStream; import java.io.PrintWriter; import java.net.MalformedURLException; import java.net.URL; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Set; -import java.util.Vector; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import java.util.*; /** Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java Tue Aug 4 20:05:31 2009 @@ -17,26 +17,24 @@ package org.apache.struts2.jasper.servlet; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.Enumeration; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.EmbeddedServletOptions; import org.apache.struts2.jasper.Options; import org.apache.struts2.jasper.compiler.JspRuntimeContext; import org.apache.struts2.jasper.compiler.Localizer; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.util.Enumeration; + /** * The JSP engine (a.k.a Jasper). * Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java Tue Aug 4 20:05:31 2009 @@ -17,20 +17,6 @@ package org.apache.struts2.jasper.servlet; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URL; - -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.SingleThreadModel; -import javax.servlet.UnavailableException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.tagext.TagInfo; - import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; import org.apache.struts2.jasper.Options; @@ -40,6 +26,14 @@ import org.apache.struts2.jasper.compiler.Localizer; import org.apache.struts2.jasper.runtime.JspSourceDependent; +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.tagext.TagInfo; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URL; + /** * The JSP engine (a.k.a Jasper). * Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java Tue Aug 4 20:05:31 2009 @@ -18,13 +18,6 @@ package org.apache.struts2.jasper.tagplugins.jstl; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.util.Locale; - import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -32,6 +25,8 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspTagException; import javax.servlet.jsp.PageContext; +import java.io.*; +import java.util.Locale; /** * Util contains some often used consts, static methods and embedded class Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Choose.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Choose.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Choose.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Choose.java Tue Aug 4 20:05:31 2009 @@ -18,7 +18,8 @@ package org.apache.struts2.jasper.tagplugins.jstl.core; -import org.apache.struts2.jasper.compiler.tagplugin.*; +import org.apache.struts2.jasper.compiler.tagplugin.TagPlugin; +import org.apache.struts2.jasper.compiler.tagplugin.TagPluginContext; public final class Choose implements TagPlugin { Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/ForEach.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/ForEach.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/ForEach.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/ForEach.java Tue Aug 4 20:05:31 2009 @@ -18,7 +18,8 @@ package org.apache.struts2.jasper.tagplugins.jstl.core; -import org.apache.struts2.jasper.compiler.tagplugin.*; +import org.apache.struts2.jasper.compiler.tagplugin.TagPlugin; +import org.apache.struts2.jasper.compiler.tagplugin.TagPluginContext; public final class ForEach implements TagPlugin { Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/If.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/If.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/If.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/If.java Tue Aug 4 20:05:31 2009 @@ -18,7 +18,8 @@ package org.apache.struts2.jasper.tagplugins.jstl.core; -import org.apache.struts2.jasper.compiler.tagplugin.*; +import org.apache.struts2.jasper.compiler.tagplugin.TagPlugin; +import org.apache.struts2.jasper.compiler.tagplugin.TagPluginContext; public final class If implements TagPlugin { Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Otherwise.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Otherwise.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Otherwise.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Otherwise.java Tue Aug 4 20:05:31 2009 @@ -18,7 +18,8 @@ package org.apache.struts2.jasper.tagplugins.jstl.core; -import org.apache.struts2.jasper.compiler.tagplugin.*; +import org.apache.struts2.jasper.compiler.tagplugin.TagPlugin; +import org.apache.struts2.jasper.compiler.tagplugin.TagPluginContext; public final class Otherwise implements TagPlugin { Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/When.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/When.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/When.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/When.java Tue Aug 4 20:05:31 2009 @@ -18,7 +18,8 @@ package org.apache.struts2.jasper.tagplugins.jstl.core; -import org.apache.struts2.jasper.compiler.tagplugin.*; +import org.apache.struts2.jasper.compiler.tagplugin.TagPlugin; +import org.apache.struts2.jasper.compiler.tagplugin.TagPluginContext; public final class When implements TagPlugin { Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/util/FastDateFormat.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/util/FastDateFormat.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/util/FastDateFormat.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/util/FastDateFormat.java Tue Aug 4 20:05:31 2009 @@ -17,12 +17,11 @@ package org.apache.struts2.jasper.util; -import java.util.Date; - import java.text.DateFormat; import java.text.FieldPosition; import java.text.ParsePosition; import java.text.SimpleDateFormat; +import java.util.Date; /** * Fast date formatter that caches recently formatted date information Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ASCIIReader.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ASCIIReader.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ASCIIReader.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ASCIIReader.java Tue Aug 4 20:05:31 2009 @@ -17,10 +17,11 @@ package org.apache.struts2.jasper.xmlparser; -import java.io.InputStream; +import org.apache.struts2.jasper.compiler.Localizer; + import java.io.IOException; +import java.io.InputStream; import java.io.Reader; -import org.apache.struts2.jasper.compiler.Localizer; /** * A simple ASCII byte reader. This is an optimized reader for reading Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java Tue Aug 4 20:05:31 2009 @@ -17,29 +17,19 @@ package org.apache.struts2.jasper.xmlparser; -import java.io.IOException; -import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.compiler.Localizer; -import org.w3c.dom.Comment; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; -import org.xml.sax.EntityResolver; -import org.xml.sax.ErrorHandler; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; +import org.w3c.dom.*; +import org.xml.sax.*; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.IOException; +import java.io.InputStream; /** Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UCSReader.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UCSReader.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UCSReader.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UCSReader.java Tue Aug 4 20:05:31 2009 @@ -17,8 +17,8 @@ package org.apache.struts2.jasper.xmlparser; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.Reader; /** Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UTF8Reader.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UTF8Reader.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UTF8Reader.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/UTF8Reader.java Tue Aug 4 20:05:31 2009 @@ -17,11 +17,12 @@ package org.apache.struts2.jasper.xmlparser; -import java.io.InputStream; +import org.apache.struts2.jasper.compiler.Localizer; + import java.io.IOException; +import java.io.InputStream; import java.io.Reader; import java.io.UTFDataFormatException; -import org.apache.struts2.jasper.compiler.Localizer; /** * @author Andy Clark, IBM Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/XMLEncodingDetector.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/XMLEncodingDetector.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/XMLEncodingDetector.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/jasper/xmlparser/XMLEncodingDetector.java Tue Aug 4 20:05:31 2009 @@ -25,19 +25,15 @@ package org.apache.struts2.jasper.xmlparser; -import java.io.EOFException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.Reader; -import java.util.Locale; -import java.util.jar.JarFile; - import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; import org.apache.struts2.jasper.compiler.ErrorDispatcher; import org.apache.struts2.jasper.compiler.JspUtil; +import java.io.*; +import java.util.Locale; +import java.util.jar.JarFile; + public class XMLEncodingDetector { private InputStream stream; Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java Tue Aug 4 20:05:31 2009 @@ -31,6 +31,16 @@ assertEquals("hello", response.getContentAsString()); } + public void testTag0() throws Exception { + //mock objects + EmbeddedJSPResult result = new EmbeddedJSPResult(); + + result.setLocation("org/apache/struts2/tag0.jsp"); + result.execute(null); + + assertEquals("Thissessionisnotsecure.OtherText", cleanup(response.getContentAsString())); + } + public void testIncludeSimple() throws Exception { //mock objects EmbeddedJSPResult result = new EmbeddedJSPResult(); Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp?rev=800942&r1=800941&r2=800942&view=diff ============================================================================== --- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp (original) +++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp Tue Aug 4 20:05:31 2009 @@ -1,3 +1,5 @@ -<%@ taglib prefix="dt" uri="http://displaytag.sf.net"; %> -<dt:table /> +<%@ taglib prefix="r" uri="http://jakarta.apache.org/taglibs/request-1.0"; %> +<r:isSecure value="false"> + This session is not secure. +</r:isSecure> OtherText \ No newline at end of file
