Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 38276 invoked from network); 12 Jul 2006 06:07:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jul 2006 06:07:58 -0000 Received: (qmail 85820 invoked by uid 500); 12 Jul 2006 06:07:51 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 85754 invoked by uid 500); 12 Jul 2006 06:07:51 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 85733 invoked by uid 99); 12 Jul 2006 06:07:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2006 23:07:51 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2006 23:07:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 56E421A981A; Tue, 11 Jul 2006 23:07:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421151 [1/2] - in /struts/struts1/trunk/tiles/src: main/java/org/apache/struts/tiles/ main/java/org/apache/struts/tiles/actions/ main/java/org/apache/struts/tiles/beans/ main/java/org/apache/struts/tiles/commands/ main/java/org/apache/stru... Date: Wed, 12 Jul 2006 06:07:17 -0000 To: commits@struts.apache.org From: wsmoak@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060712060726.56E421A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wsmoak Date: Tue Jul 11 23:07:14 2006 New Revision: 421151 URL: http://svn.apache.org/viewvc?rev=421151&view=rev Log: STR-2900 Fix Checkstyle errors in struts-tiles. Submitted by: Frank Zammetti Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/TilesAction.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ViewDefinitionsAction.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/MenuItem.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/SimpleMenuItem.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/util/TagUtils.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/FactorySet.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlAttribute.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinition.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlDefinitionsSet.java struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/XmlListAttribute.java struts/struts1/trunk/tiles/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -28,60 +28,61 @@ import org.apache.struts.action.Action; /** - * Struts wrapper implementation of Controller. This implementation wraps an + * Struts wrapper implementation of Controller. This implementation wraps an * Action in a Controller. */ public class ActionController implements Controller { - /** - * Struts action wrapped. - */ - private Action action = null; - - /** - * Constructor. - * @param action Action to be wrapped. - */ - public ActionController(Action action) { - this.action = action; - } - - /** - * Method associated to a tile and called immediately before tile is - * included. This implementation calls a Struts Action. No servlet is - * set by this method. - * - * @param tileContext Current tile context. - * @param request Current request. - * @param response Current response. - * @param servletContext Current servlet context. - */ - public void perform( - ComponentContext tileContext, - HttpServletRequest request, - HttpServletResponse response, - ServletContext servletContext) - throws ServletException, IOException { - - try { - action.execute(null, null, request, response); - - } catch (Exception e) { - throw new ServletException(e); - } - } - - /** - * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext) - */ - public void execute( - ComponentContext tileContext, - HttpServletRequest request, - HttpServletResponse response, - ServletContext servletContext) - throws Exception { - - this.action.execute(null, null, request, response); + /** + * Struts action wrapped. + */ + private Action action = null; + + /** + * Constructor. + * + * @param action Action to be wrapped. + */ + public ActionController(Action action) { + this.action = action; + } + + /** + * Method associated to a tile and called immediately before tile is + * included. This implementation calls a Struts Action. No servlet is + * set by this method. + * + * @param tileContext Current tile context. + * @param request Current request. + * @param response Current response. + * @param servletContext Current servlet context. + */ + public void perform( + ComponentContext tileContext, + HttpServletRequest request, + HttpServletResponse response, + ServletContext servletContext) + throws ServletException, IOException { + + try { + action.execute(null, null, request, response); + + } catch (Exception e) { + throw new ServletException(e); + } + } + + /** + * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext) + */ + public void execute( + ComponentContext tileContext, + HttpServletRequest request, + HttpServletResponse response, + ServletContext servletContext) + throws Exception { + + this.action.execute(null, null, request, response); - } + } } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -32,7 +32,7 @@ * Return value hold by this typed attribute. */ public Object getValue(); - + /** * Set role attribute. */ Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -70,7 +70,7 @@ attributes = new HashMap(newAttributes); return; } - + attributes.putAll(newAttributes); } @@ -85,7 +85,7 @@ if (defaultAttributes == null) { return; } - + if (attributes == null) { attributes = new HashMap(defaultAttributes); return; @@ -110,7 +110,7 @@ if (attributes == null){ return null; } - + return attributes.get(name); } @@ -122,7 +122,7 @@ if (attributes == null) { return Collections.EMPTY_LIST.iterator(); } - + return attributes.keySet().iterator(); } @@ -151,7 +151,7 @@ if (attribute == null) { attribute = pageContext.findAttribute(beanName); } - + return attribute; } @@ -167,11 +167,11 @@ String beanName, int scope, PageContext pageContext) { - + if (scope == ComponentConstants.COMPONENT_SCOPE){ return getAttribute(beanName); } - + return pageContext.getAttribute(beanName, scope); } @@ -196,7 +196,7 @@ static public void setContext( ComponentContext context, ServletRequest request) { - + request.setAttribute(ComponentConstants.COMPONENT_CONTEXT, context); } } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -35,7 +35,7 @@ public class ComponentDefinition implements Serializable { /** - * Commons Logging instance. + * Commons Logging instance. */ protected static Log log = LogFactory.getLog(ComponentDefinition.class); @@ -54,32 +54,32 @@ */ protected Map attributes = null; - /** - * Role associated to definition. + /** + * Role associated to definition. */ protected String role = null; /** Associated Controller URL or classname, if defined */ protected String controller = null; - /** + /** * Associated Controller typename, if controllerName defined. - * Can be CONTROLLER, ACTION or URL, or null. + * Can be CONTROLLER, ACTION or URL, or null. */ protected String controllerType = null; - /** - * Controller name type. + /** + * Controller name type. */ public static final String URL = "url"; - /** - * Controller name type. + /** + * Controller name type. */ public static final String CONTROLLER = "controller"; - /** - * Controller name type. + /** + * Controller name type. */ public static final String ACTION = "action"; Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -27,40 +27,42 @@ /** * A controller is a piece of code called before rendering a jsp page. - * A controller can be associated to a tile. See <insert> or + * A controller can be associated to a tile. See <insert> or * <definition> for association syntax. */ public interface Controller { - /** - * Method associated to a tile and called immediately before the tile + /** + * Method associated to a tile and called immediately before the tile * is included. - * @param tileContext Current tile context. - * @param request Current request - * @param response Current response - * @param servletContext Current servlet context - * @deprecated Use execute() instead. This will be removed after - * Struts 1.2. - */ - public void perform( - ComponentContext tileContext, - HttpServletRequest request, - HttpServletResponse response, - ServletContext servletContext) - throws ServletException, IOException; - + * + * @param tileContext Current tile context. + * @param request Current request + * @param response Current response + * @param servletContext Current servlet context + * @deprecated Use execute() instead. This will be removed after + * Struts 1.2. + */ + public void perform( + ComponentContext tileContext, + HttpServletRequest request, + HttpServletResponse response, + ServletContext servletContext) + throws ServletException, IOException; + /** - * Method associated to a tile and called immediately before the tile + * Method associated to a tile and called immediately before the tile * is included. - * @param tileContext Current tile context. - * @param request Current request - * @param response Current response + * + * @param tileContext Current tile context. + * @param request Current request + * @param response Current response * @param servletContext Current servlet context */ public void execute( - ComponentContext tileContext, - HttpServletRequest request, - HttpServletResponse response, - ServletContext servletContext) - throws Exception; + ComponentContext tileContext, + HttpServletRequest request, + HttpServletResponse response, + ServletContext servletContext) + throws Exception; } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -27,39 +27,40 @@ /** * Basic implementation of Controller. Implementations can extend this class - * to insulate themselves from changes in the Controller + * to insulate themselves from changes in the Controller * interface. */ public class ControllerSupport implements Controller { - /** - * Method associated to a tile and called immediately before tile is - * included. This implementation does nothing. - * @param tileContext Current tile context. - * @param request Current request - * @param response Current response - * @param servletContext Current servlet context - * @deprecated Use execute() instead. This will be removed after - * Struts 1.2. - */ - public void perform( - ComponentContext tileContext, - HttpServletRequest request, - HttpServletResponse response, - ServletContext servletContext) - throws ServletException, IOException { - } - - /** - * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext) - */ - public void execute( - ComponentContext tileContext, - HttpServletRequest request, - HttpServletResponse response, - ServletContext servletContext) - throws Exception { + /** + * Method associated to a tile and called immediately before tile is + * included. This implementation does nothing. + * + * @param tileContext Current tile context. + * @param request Current request + * @param response Current response + * @param servletContext Current servlet context + * @deprecated Use execute() instead. This will be removed after + * Struts 1.2. + */ + public void perform( + ComponentContext tileContext, + HttpServletRequest request, + HttpServletResponse response, + ServletContext servletContext) + throws ServletException, IOException { + } + + /** + * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext) + */ + public void execute( + ComponentContext tileContext, + HttpServletRequest request, + HttpServletResponse response, + ServletContext servletContext) + throws Exception { - perform(tileContext, request, response, servletContext); - } + perform(tileContext, request, response, servletContext); + } } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -23,7 +23,7 @@ * Such attribute value represent an instance name. */ public class DefinitionNameAttribute extends UntypedAttribute { - + /** * Constructor. */ Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -50,8 +50,8 @@ */ protected boolean parserValidate = true; - /** - * Definition configuration file specified by user. + /** + * Definition configuration file specified by user. */ protected String definitionConfigFiles = null; @@ -70,33 +70,33 @@ */ protected String factoryName; - /** - * Alternate name for parser debug details properties in configuration file. + /** + * Alternate name for parser debug details properties in configuration file. * @deprecated This will be removed in a release after Struts 1.2. */ public static final String PARSER_DETAILS_PARAMETER_NAME = "definitions-parser-details"; /** - * Alternate name for parser validate properties in configuration file. + * Alternate name for parser validate properties in configuration file. */ public static final String PARSER_VALIDATE_PARAMETER_NAME = "definitions-parser-validate"; - /** - * Alternate name for factory classname properties in configuration file. + /** + * Alternate name for factory classname properties in configuration file. */ public static final String FACTORY_CLASSNAME_PARAMETER_NAME = "definitions-factory-class"; - /** - * Alternate name for definition files properties in configuration file. + /** + * Alternate name for definition files properties in configuration file. */ public static final String DEFINITIONS_CONFIG_PARAMETER_NAME = "definitions-config"; - /** - * Alternate name for definition debug details properties in configuration file. + /** + * Alternate name for definition debug details properties in configuration file. * @deprecated This will be removed in a release after Struts 1.2. */ public static final String TILES_DETAILS_PARAMETER_NAME = "definitions-debug"; @@ -219,7 +219,7 @@ map.put(TILES_DETAILS_PARAMETER_NAME, Integer.toString(getDebugLevel()) ); map.put(PARSER_DETAILS_PARAMETER_NAME, Integer.toString(getParserDebugLevel()) ); map.put(PARSER_VALIDATE_PARAMETER_NAME, new Boolean(getParserValidate()).toString() ); - + if( ! "org.apache.struts.tiles.xmlDefinition.I18nFactorySet".equals(getFactoryClassname()) ) map.put(FACTORY_CLASSNAME_PARAMETER_NAME, getFactoryClassname()); */ Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -38,44 +38,44 @@ */ public class DefinitionsUtil extends TilesUtil implements ComponentConstants { - /** - * Commons Logging instance. + /** + * Commons Logging instance. */ protected static Log log = LogFactory.getLog(DefinitionsUtil.class); - /** + /** * Global user defined debug level. - * @deprecated This will be removed in a release after Struts 1.2. + * @deprecated This will be removed in a release after Struts 1.2. */ public static int userDebugLevel = 0; - /** - * User Debug level. - * @deprecated This will be removed in a release after Struts 1.2. + /** + * User Debug level. + * @deprecated This will be removed in a release after Struts 1.2. */ public static final int NO_DEBUG = 0; - /** - * Name of init property carrying debug level. + /** + * Name of init property carrying debug level. */ public static final String DEFINITIONS_CONFIG_USER_DEBUG_LEVEL = "definitions-debug"; - /** - * Name of init property carrying factory class name. + /** + * Name of init property carrying factory class name. */ public static final String DEFINITIONS_FACTORY_CLASSNAME = "definitions-factory-class"; - /** - * Constant name used to store factory in context. + /** + * Constant name used to store factory in context. */ public static final String DEFINITIONS_FACTORY = "org.apache.struts.tiles.DEFINITIONS_FACTORY"; - /** + /** * Constant name used to store definition in jsp context. - * Used to pass definition from a Struts action to servlet forward. + * Used to pass definition from a Struts action to servlet forward. */ public static final String ACTION_DEFINITION = "org.apache.struts.tiles.ACTION_DEFINITION"; Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -60,28 +60,28 @@ */ public class TilesPlugin implements PlugIn { - /** - * Commons Logging instance. + /** + * Commons Logging instance. */ protected static Log log = LogFactory.getLog(TilesPlugin.class); - /** - * Is the factory module aware? + /** + * Is the factory module aware? */ protected boolean moduleAware = false; - /** + /** * Tiles util implementation classname. This property can be set * by user in the plugin declaration. */ protected String tilesUtilImplClassname = null; - /** - * Associated definition factory. + /** + * Associated definition factory. */ protected DefinitionsFactory definitionFactory = null; - /** + /** * The plugin config object provided by the ActionServlet initializing * this plugin. */ @@ -121,15 +121,15 @@ */ public void init(ActionServlet servlet, ModuleConfig moduleConfig) throws ServletException { - + // Create factory config object DefinitionsFactoryConfig factoryConfig = readFactoryConfig(servlet, moduleConfig); - + // Set the module name in the config. This name will be used to compute // the name under which the factory is stored. factoryConfig.setFactoryName(moduleConfig.getPrefix()); - + // Set RequestProcessor class this.initRequestProcessorClass(moduleConfig); @@ -139,9 +139,9 @@ } /** - * Set TilesUtil implementation according to properties 'tilesUtilImplClassname' + * Set TilesUtil implementation according to properties 'tilesUtilImplClassname' * and 'moduleAware'. These properties are taken into account only once. A - * side effect is that only the values set in the first initialized plugin are + * side effect is that only the values set in the first initialized plugin are * effectively taken into account. * @throws ServletException */ @@ -200,13 +200,13 @@ ModuleConfig moduleConfig, DefinitionsFactoryConfig factoryConfig) throws ServletException { - + // Check if a factory already exist for this module definitionFactory = ((TilesUtilStrutsImpl) TilesUtil.getTilesUtil()).getDefinitionsFactory( servletContext, moduleConfig); - + if (definitionFactory != null) { log.info( "Factory already exists for module '" @@ -214,26 +214,26 @@ + "'. The factory found is from module '" + definitionFactory.getConfig().getFactoryName() + "'. No new creation."); - + return; } - + // Create configurable factory try { definitionFactory = TilesUtil.createDefinitionsFactory( servletContext, factoryConfig); - + } catch (DefinitionsFactoryException ex) { log.error( "Can't create Tiles definition factory for module '" + moduleConfig.getPrefix() + "'."); - + throw new ServletException(ex); } - + log.info( "Tiles definition factory loaded for module '" + moduleConfig.getPrefix() @@ -262,7 +262,7 @@ ActionServlet servlet, ModuleConfig config) throws ServletException { - + // Create tiles definitions config object DefinitionsFactoryConfig factoryConfig = new DefinitionsFactoryConfig(); // Get init parameters from web.xml files @@ -270,7 +270,7 @@ DefinitionsUtil.populateDefinitionsFactoryConfig( factoryConfig, servlet.getServletConfig()); - + } catch (Exception ex) { if (log.isDebugEnabled()){ log.debug("", ex); @@ -280,24 +280,24 @@ "Can't populate DefinitionsFactoryConfig class from 'web.xml': " + ex.getMessage()); } - + // Get init parameters from struts-config.xml try { Map strutsProperties = findStrutsPlugInConfigProperties(servlet, config); factoryConfig.populate(strutsProperties); - + } catch (Exception ex) { if (log.isDebugEnabled()) { log.debug("", ex); } - + throw new UnavailableException( "Can't populate DefinitionsFactoryConfig class from '" + config.getPrefix() + "/struts-config.xml':" + ex.getMessage()); } - + return factoryConfig; } @@ -317,7 +317,7 @@ ActionServlet servlet, ModuleConfig config) throws ServletException { - + return currentPlugInConfigObject.getProperties(); } @@ -333,7 +333,7 @@ */ protected void initRequestProcessorClass(ModuleConfig config) throws ServletException { - + String tilesProcessorClassname = TilesRequestProcessor.class.getName(); ControllerConfig ctrlConfig = config.getControllerConfig(); String configProcessorClassname = ctrlConfig.getProcessorClass(); @@ -343,7 +343,7 @@ try { configProcessorClass = RequestUtils.applicationClass(configProcessorClassname); - + } catch (ClassNotFoundException ex) { log.fatal( "Can't set TilesRequestProcessor: bad class name '" @@ -356,13 +356,13 @@ // no need to replace the request processor. if (ComposableRequestProcessor.class.isAssignableFrom(configProcessorClass)) { return; - } + } // Check if it is the default request processor or Tiles one. // If true, replace by Tiles' one. if (configProcessorClassname.equals(RequestProcessor.class.getName()) || configProcessorClassname.endsWith(tilesProcessorClassname)) { - + ctrlConfig.setProcessorClass(tilesProcessorClassname); return; } @@ -388,7 +388,7 @@ public void setTilesUtilImplClassname(String tilesUtilImplClassname) { this.tilesUtilImplClassname = tilesUtilImplClassname; } - + /** * Get Tiles util implemention classname. * @return The classname or null if none is set. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -42,7 +42,7 @@ * if the underlying implementation doesn't support the operation. */ public class TilesUtil { - + /** Commons Logging instance.*/ protected static Log log = LogFactory.getLog(TilesUtil.class); @@ -98,7 +98,7 @@ HttpServletResponse response, ServletContext servletContext) throws IOException, ServletException { - + tilesUtilImpl.doForward(uri, request, response, servletContext); } @@ -118,7 +118,7 @@ HttpServletResponse response, ServletContext servletContext) throws IOException, ServletException { - + tilesUtilImpl.doInclude(uri, request, response, servletContext); } @@ -134,7 +134,7 @@ throws IOException, ServletException { doInclude(uri, pageContext, true); } - + /** * Do an include using PageContext.include(). * @@ -195,13 +195,13 @@ ServletRequest request, ServletContext servletContext) throws FactoryNotFoundException, DefinitionsFactoryException { - + try { return getDefinitionsFactory(request, servletContext).getDefinition( definitionName, (HttpServletRequest) request, servletContext); - + } catch (NullPointerException ex) { // Factory not found in context throw new FactoryNotFoundException("Can't get definitions factory from context."); } @@ -216,4 +216,4 @@ tilesUtilImpl = new TilesUtilImpl(); } -} \ No newline at end of file +} Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -42,19 +42,19 @@ * is intended to be used without Struts. */ public class TilesUtilImpl implements Serializable { - + /** Commons Logging instance.*/ protected static final Log log = LogFactory.getLog(TilesUtil.class); /** Constant name used to store factory in servlet context */ public static final String DEFINITIONS_FACTORY = "org.apache.struts.tiles.DEFINITIONS_FACTORY"; - + /** * JSP 2.0 include method to use which supports configurable flushing. */ - private static Method include = null; - + private static Method include = null; + /** * Initialize the include variable with the * JSP 2.0 method if available. @@ -85,7 +85,7 @@ HttpServletResponse response, ServletContext servletContext) throws IOException, ServletException { - + request.getRequestDispatcher(uri).forward(request, response); } @@ -105,7 +105,7 @@ HttpServletResponse response, ServletContext servletContext) throws IOException, ServletException { - + request.getRequestDispatcher(uri).include(request, response); } @@ -125,13 +125,13 @@ if (include != null) { include.invoke(pageContext, new Object[]{uri, Boolean.valueOf(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); } @@ -142,7 +142,7 @@ public DefinitionsFactory getDefinitionsFactory( ServletRequest request, ServletContext servletContext) { - + return (DefinitionsFactory) servletContext.getAttribute(DEFINITIONS_FACTORY); } @@ -164,13 +164,13 @@ ServletContext servletContext, DefinitionsFactoryConfig factoryConfig) throws DefinitionsFactoryException { - + // Create configurable factory DefinitionsFactory factory = createDefinitionFactoryInstance(factoryConfig.getFactoryClassname()); - + factory.init(factoryConfig, servletContext); - + // Make factory accessible from jsp tags (push it in appropriate context) makeDefinitionsFactoryAccessible(factory, servletContext); return factory; @@ -187,7 +187,7 @@ */ protected DefinitionsFactory createDefinitionFactoryInstance(String classname) throws DefinitionsFactoryException { - + try { Class factoryClass = RequestUtils.applicationClass(classname); Object factory = factoryClass.newInstance(); @@ -200,29 +200,29 @@ (ComponentDefinitionsFactory) factory); } return (DefinitionsFactory) factory; - + } catch (ClassCastException ex) { // Bad classname throw new DefinitionsFactoryException( "Error - createDefinitionsFactory : Factory class '" + classname + " must implement 'TilesDefinitionsFactory'.", ex); - + } catch (ClassNotFoundException ex) { // Bad classname throw new DefinitionsFactoryException( "Error - createDefinitionsFactory : Bad class name '" + classname + "'.", ex); - + } catch (InstantiationException ex) { // Bad constructor or error throw new DefinitionsFactoryException(ex); - + } catch (IllegalAccessException ex) { throw new DefinitionsFactoryException(ex); } } - + /** * Make definition factory accessible to Tags. * Factory is stored in servlet context. @@ -232,8 +232,8 @@ protected void makeDefinitionsFactoryAccessible( DefinitionsFactory factory, ServletContext servletContext) { - + servletContext.setAttribute(DEFINITIONS_FACTORY, factory); } -} \ No newline at end of file +} Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -39,8 +39,8 @@ public DefinitionsFactory getDefinitionsFactory( ServletContext servletContext, ModuleConfig moduleConfig) { - + return (DefinitionsFactory) servletContext.getAttribute(DEFINITIONS_FACTORY); } -} \ No newline at end of file +} Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -79,7 +79,7 @@ HttpServletResponse response, ServletContext servletContext) throws IOException, ServletException { - + request.getRequestDispatcher(uri).include(request, response); } @@ -92,7 +92,7 @@ public DefinitionsFactory getDefinitionsFactory( ServletRequest request, ServletContext servletContext) { - + return getDefinitionsFactory( servletContext, getModuleConfig((HttpServletRequest) request, servletContext)); @@ -167,4 +167,4 @@ return moduleConfig; } -} \ No newline at end of file +} Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -19,7 +19,7 @@ package org.apache.struts.tiles; /** - * Common implementation of attribute definition. + * Common implementation of attribute definition. */ public class UntypedAttribute implements AttributeDefinition { @@ -27,7 +27,7 @@ * Role associated to this attribute. */ protected String role = null; - + protected Object value=null; /** Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -67,9 +67,9 @@ * @version $Rev$ $Date$ */ public class DefinitionDispatcherAction extends Action { - - /** - * Commons Logging instance. + + /** + * Commons Logging instance. */ protected static Log log = LogFactory.getLog(DefinitionDispatcherAction.class); @@ -93,7 +93,7 @@ HttpServletRequest request, HttpServletResponse response) throws Exception { - + // Identify the request parameter containing the method name // If none defined, use "def" String parameter = mapping.getParameter(); @@ -104,7 +104,7 @@ // Identify the method name to be dispatched to String name = request.getParameter(parameter); if (name == null) { - log.error("Can't get parameter '" + parameter + "'."); + log.error("Can't get parameter '" + parameter + "'."); return mapping.findForward("error"); } @@ -117,25 +117,25 @@ name, request, getServlet().getServletContext()); - + if (log.isDebugEnabled()) { log.debug("Get Definition " + definition); } - + DefinitionsUtil.setActionDefinition(request, definition); - + } catch (FactoryNotFoundException e) { log.error("Can't get definition factory.", e); return mapping.findForward("error"); - + } catch (NoSuchDefinitionException e) { log.error("Can't get definition '" + name + "'.", e); return mapping.findForward("error"); - + } catch (DefinitionsFactoryException e) { log.error("General Factory error '" + e.getMessage() + "'.", e); return mapping.findForward("error"); - + } catch (Exception e) { log.error("General error '" + e.getMessage() + "'.", e); return mapping.findForward("error"); Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -90,4 +90,3 @@ } } - Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/TilesAction.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/TilesAction.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/TilesAction.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/TilesAction.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -60,7 +60,7 @@ HttpServletRequest request, HttpServletResponse response) throws Exception { - + // Try to retrieve tile context ComponentContext context = ComponentContext.getContext(request); if (context == null) { @@ -69,7 +69,7 @@ + this.getClass().getName() + "'. TilesAction subclasses must be called from a Tile"); } - + return this.execute(context, mapping, form, request, response); } @@ -97,7 +97,7 @@ HttpServletRequest request, HttpServletResponse response) throws Exception { - + return null; } Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ViewDefinitionsAction.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ViewDefinitionsAction.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ViewDefinitionsAction.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/ViewDefinitionsAction.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -68,7 +68,8 @@ try { ServletContext context = getServlet().getServletContext(); - DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(request, context ); + DefinitionsFactory factory = + TilesUtil.getDefinitionsFactory(request, context ); writer.println( factory.toString() ); } catch (Exception e) { writer.println("FAIL - " + e.toString()); @@ -83,4 +84,3 @@ } } - Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/MenuItem.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/MenuItem.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/MenuItem.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/MenuItem.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -25,7 +25,7 @@ * @see SimpleMenuItem */ public interface MenuItem extends Serializable { - + /** * Set value property. */ Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/SimpleMenuItem.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/SimpleMenuItem.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/SimpleMenuItem.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/beans/SimpleMenuItem.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java Tue Jul 11 23:07:14 2006 @@ -2,13 +2,13 @@ * $Id$ * * Copyright 2004-2005 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. @@ -257,11 +257,11 @@ rd.forward(context.getRequest(), context.getResponse()); } } - + /** - *

Get the RequestDispatcher for the specified uri. If it is not found, - * send a 500 error as a response and return null; - * + *

Get the RequestDispatcher for the specified uri. If it is not found, + * send a 500 error as a response and return null; + * * @param context the current ServletActionContext * @param uri the ServletContext-relative URI of the request dispatcher to find. * @return the RequestDispatcher, or null if none is returned from the ServletContext. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -39,12 +39,12 @@ */ public class ComponentDefinitionsFactoryWrapper implements DefinitionsFactory { - /** - * The underlying factory. + /** + * The underlying factory. */ private ComponentDefinitionsFactory factory = null; - /** + /** * Factory configuration, */ private DefinitionsFactoryConfig config = null; Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. @@ -45,18 +45,18 @@ */ public class ReloadableDefinitionsFactory implements ComponentDefinitionsFactory { - /** - * The real factory instance. + /** + * The real factory instance. */ protected ComponentDefinitionsFactory factory = null; - /** - * Initialization parameters. + /** + * Initialization parameters. */ protected Map properties = null; - /** - * Name of init property carrying factory class name. + /** + * Name of init property carrying factory class name. */ public static final String DEFINITIONS_FACTORY_CLASSNAME = "definitions-factory-class"; Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java Tue Jul 11 23:07:14 2006 @@ -2,13 +2,13 @@ * $Id$ * * Copyright 2004 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. @@ -73,7 +73,7 @@ * @param property The property name */ public void setProperty(String property) - { + { this.property = property; } @@ -99,7 +99,7 @@ { if( id==null ) id=property; - + ComponentContext compContext = (ComponentContext)pageContext.getAttribute( ComponentConstants.COMPONENT_CONTEXT, PageContext.REQUEST_SCOPE); if( compContext == null ) Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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. Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetTag.java?rev=421151&r1=421150&r2=421151&view=diff ============================================================================== --- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetTag.java (original) +++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/GetTag.java Tue Jul 11 23:07:14 2006 @@ -1,14 +1,14 @@ /* - * $Id$ + * $Id$ * * Copyright 1999-2004 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.