Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009 @@ -40,6 +40,7 @@ * or extending {...@link org.apache.tiles.startup.AbstractTilesInitializer} and * overriding <code>createTilesApplicationContext</code> method.<br> */ +...@deprecated public class PortletTilesApplicationContextFactory extends AbstractTilesApplicationContextFactory implements Initializable { @@ -48,7 +49,8 @@ } /** {...@inheritdoc} */ - public TilesApplicationContext createApplicationContext(Object context) { + @Override + public TilesApplicationContext createApplicationContext(Object context) { if (context instanceof PortletContext) { PortletContext portletContext = (PortletContext) context; return new PortletTilesApplicationContext(portletContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java Sat Oct 24 13:54:15 2009 @@ -38,6 +38,7 @@ * @deprecated Use {...@link PortletTilesApplicationContextFactory} or * {...@link PortletTilesRequestContextFactory}. */ +...@deprecated public class PortletTilesContextFactory implements TilesContextFactory { /** {...@inheritdoc} */ Modified: tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContext.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContext.java Sat Oct 24 13:54:15 2009 @@ -31,6 +31,7 @@ * @since 2.1.0 * @deprecated Use {...@link org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext}. */ +...@deprecated public class WildcardServletTilesApplicationContext extends org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext { @@ -44,7 +45,8 @@ * #WildcardServletTilesApplicationContext(ServletContext)} * . */ - public WildcardServletTilesApplicationContext(ServletContext servletContext) { + @Deprecated + public WildcardServletTilesApplicationContext(ServletContext servletContext) { super(servletContext); } } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009 @@ -39,6 +39,7 @@ * @deprecated Create an instance of * {...@link WildcardServletTilesApplicationContext} directly. */ +...@deprecated public class WildcardServletTilesApplicationContextFactory extends AbstractTilesApplicationContextFactory implements Initializable { @@ -48,7 +49,8 @@ } /** {...@inheritdoc} */ - public TilesApplicationContext createApplicationContext(Object context) { + @Override + public TilesApplicationContext createApplicationContext(Object context) { if (context instanceof ServletContext) { ServletContext servletContext = (ServletContext) context; return new WildcardServletTilesApplicationContext(servletContext); Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java Sat Oct 24 13:54:15 2009 @@ -108,7 +108,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { ServletContext otherContext = ((ServletApplicationScopeMap) o).context; boolean retValue = true; @@ -133,7 +134,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (context.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java Sat Oct 24 13:54:15 2009 @@ -50,7 +50,8 @@ * @param request The request object to use. * @deprecated Use {...@link #ServletHeaderMap(HttpServletRequest,HttpServletResponse)} instead */ - public ServletHeaderMap(HttpServletRequest request) { + @Deprecated + public ServletHeaderMap(HttpServletRequest request) { this(request, null); } @@ -119,7 +120,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { HttpServletRequest otherRequest = ((ServletHeaderMap) o).request; boolean retValue = true; @@ -144,7 +146,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (request.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java Sat Oct 24 13:54:15 2009 @@ -116,7 +116,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { HttpServletRequest otherRequest = ((ServletHeaderValuesMap) o).request; boolean retValue = true; @@ -147,7 +148,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (request.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java Sat Oct 24 13:54:15 2009 @@ -99,7 +99,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { ServletContext otherContext = ((ServletInitParamMap) o).context; boolean retValue = true; @@ -124,7 +125,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (context.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java Sat Oct 24 13:54:15 2009 @@ -100,7 +100,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { ServletRequest otherRequest = ((ServletParamMap) o).request; boolean retValue = true; @@ -125,7 +126,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (request.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java Sat Oct 24 13:54:15 2009 @@ -114,7 +114,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { ServletRequest otherRequest = ((ServletParamValuesMap) o).request; boolean retValue = true; @@ -139,7 +140,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (request.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java Sat Oct 24 13:54:15 2009 @@ -107,7 +107,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { ServletRequest otherRequest = ((ServletRequestScopeMap) o).request; boolean retValue = true; @@ -132,7 +133,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { return (request.hashCode()); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java Sat Oct 24 13:54:15 2009 @@ -119,7 +119,8 @@ /** {...@inheritdoc} */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean equals(Object o) { boolean retValue = true; @@ -156,7 +157,8 @@ /** {...@inheritdoc} */ - public int hashCode() { + @Override + public int hashCode() { HttpSession session = request.getSession(false); if (session == null) { return 0; Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java Sat Oct 24 13:54:15 2009 @@ -113,7 +113,8 @@ * @return The servlet context. * @deprecated Use {...@link #getContext()}. */ - public ServletContext getServletContext() { + @Deprecated + public ServletContext getServletContext() { return servletContext; } @@ -159,7 +160,8 @@ * {...@link org.apache.tiles.context.TilesContextFactory#createRequestContext(TilesApplicationContext, Object...)} * . */ - public TilesRequestContext createRequestContext(Object request, Object response) { + @Deprecated + public TilesRequestContext createRequestContext(Object request, Object response) { if (request instanceof HttpServletRequest) { return new ServletTilesRequestContext( servletContext, Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009 @@ -39,6 +39,7 @@ * or extending {...@link org.apache.tiles.startup.AbstractTilesInitializer} and * overriding <code>createTilesApplicationContext</code> method.<br> */ +...@deprecated public class ServletTilesApplicationContextFactory extends AbstractTilesApplicationContextFactory implements Initializable { @@ -47,7 +48,8 @@ } /** {...@inheritdoc} */ - public TilesApplicationContext createApplicationContext(Object context) { + @Override + public TilesApplicationContext createApplicationContext(Object context) { if (context instanceof ServletContext) { ServletContext servletContext = (ServletContext) context; return new ServletTilesApplicationContext(servletContext); Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java Sat Oct 24 13:54:15 2009 @@ -47,6 +47,7 @@ * {...@link org.apache.tiles.definition.Refreshable}. */ +...@deprecated public class TilesFilter extends TilesServlet implements Filter { /** @@ -102,7 +103,8 @@ /** * Destroy method for this filter. */ - public void destroy + @Override + public void destroy () { super.destroy(); } @@ -118,7 +120,8 @@ } /** {...@inheritdoc} */ - public void log(String msg) { + @Override + public void log(String msg) { filterConfig.getServletContext().log(msg); } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java Sat Oct 24 13:54:15 2009 @@ -35,6 +35,7 @@ * @version $Rev$ $Date$ * @deprecated Please extend {...@link AbstractTilesListener}. */ +...@deprecated public class TilesListener extends AbstractTilesListener { /** @@ -43,7 +44,8 @@ * @return The Tiles servlet-based initializer. * @since 2.1.2 */ - protected TilesInitializer createTilesInitializer() { + @Override + protected TilesInitializer createTilesInitializer() { return new BasicTilesInitializer(); } @@ -54,7 +56,8 @@ * @return The created container. * @deprecated Extend {...@link BasicTilesInitializer}. */ - protected TilesContainer createContainer(ServletContext context) { + @Deprecated + protected TilesContainer createContainer(ServletContext context) { TilesApplicationContext applicationContext = new ServletTilesApplicationContext( context); AbstractTilesContainerFactory factory = AbstractTilesContainerFactory Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java Sat Oct 24 13:54:15 2009 @@ -30,6 +30,7 @@ * @version $Rev$ $Date$ * @deprecated Please extend {...@link AbstractTilesInitializerServlet}. */ +...@deprecated public class TilesServlet extends AbstractTilesInitializerServlet { /** @@ -38,7 +39,8 @@ * @return The Tiles servlet-based initializer. * @since 2.1.2 */ - protected TilesInitializer createTilesInitializer() { + @Override + protected TilesInitializer createTilesInitializer() { return new BasicTilesInitializer(); } } Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java Sat Oct 24 13:54:15 2009 @@ -68,7 +68,8 @@ /** {...@inheritdoc} */ - public void init() throws ServletException { + @Override + public void init() throws ServletException { super.init(); containerKey = getServletConfig().getInitParameter( @@ -87,7 +88,8 @@ } /** {...@inheritdoc} */ - protected void doGet(HttpServletRequest req, HttpServletResponse res) + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { TilesContainer container = ServletUtil.getContainer( @@ -119,7 +121,8 @@ } /** {...@inheritdoc} */ - protected void doPost(HttpServletRequest req, HttpServletResponse res) + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { log.info("Tiles dispatch request received. Redirecting POST to GET."); doGet(req, res); Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java Sat Oct 24 13:54:15 2009 @@ -57,7 +57,8 @@ * @throws ServletException Thrown by * {...@link HttpServlet#init(ServletConfig)} */ - public void init(ServletConfig config) throws ServletException { + @Override + public void init(ServletConfig config) throws ServletException { super.init(config); include = config.getInitParameter("include"); @@ -72,7 +73,8 @@ * @throws ServletException Thrown by the {...@link #include} method. * @throws IOException Thrown by the {...@link #include} method. */ - protected void doGet(HttpServletRequest request, + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (ServletUtil.isForceInclude(request)) { request.getRequestDispatcher(include).include(request, response); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java?rev=829370&r1=829369&r2=829370&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java Sat Oct 24 13:54:15 2009 @@ -75,7 +75,8 @@ } /** {...@inheritdoc} */ - public void dispatch(String path) throws IOException { + @Override + public void dispatch(String path) throws IOException { include(path); }
