cedric 2003/07/21 08:18:48 Modified: src/tiles-documentation/org/apache/struts/webapp/tiles/portal UserPortalSettingsAction.java UserPortalAction.java UserMenuSettingsAction.java UserMenuAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/test TestActionTileAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/skin SimpleSwitchLayoutAction.java LayoutSwitchAction.java LayoutSettingsAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal SetPortalPrefsAction.java RetrievePortalAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/lang SelectLocaleAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/channel SelectChannelAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel RssChannelsAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/tutorial ForwardExampleAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/invoice EditInvoiceAction.java src/tiles-documentation/org/apache/struts/webapp/tiles/template DynTemplateAction.java Log: Replace the deprecated perform(..) method by the new execute(...) method. Revision Changes Path 1.3 +19 -17 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalSettingsAction.java Index: UserPortalSettingsAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalSettingsAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserPortalSettingsAction.java 16 Nov 2002 04:58:48 -0000 1.2 +++ UserPortalSettingsAction.java 21 Jul 2003 15:18:46 -0000 1.3 @@ -104,21 +104,23 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { //System.out.println("Enter action UserPortalSettingsAction"); PortalSettingsForm prefsForm = (PortalSettingsForm)form; 1.3 +20 -18 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalAction.java Index: UserPortalAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserPortalAction.java 16 Nov 2002 04:58:48 -0000 1.2 +++ UserPortalAction.java 21 Jul 2003 15:18:46 -0000 1.3 @@ -111,22 +111,24 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException - { + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception + { //System.out.println("Enter action UserPortalAction"); // Get user portal list from user context 1.3 +18 -16 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuSettingsAction.java Index: UserMenuSettingsAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuSettingsAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserMenuSettingsAction.java 16 Nov 2002 04:58:48 -0000 1.2 +++ UserMenuSettingsAction.java 21 Jul 2003 15:18:46 -0000 1.3 @@ -114,21 +114,23 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { if(debug) System.out.println("Enter action UserMenuSettingsAction"); 1.3 +19 -17 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuAction.java Index: UserMenuAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserMenuAction.java 16 Nov 2002 04:58:48 -0000 1.2 +++ UserMenuAction.java 21 Jul 2003 15:18:46 -0000 1.3 @@ -139,21 +139,23 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { perform( context, request, response, getServlet().getServletContext() ); return null; //(mapping.findForward("success")); 1.3 +8 -9 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestActionTileAction.java Index: TestActionTileAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestActionTileAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestActionTileAction.java 16 Nov 2002 04:58:47 -0000 1.2 +++ TestActionTileAction.java 21 Jul 2003 15:18:47 -0000 1.3 @@ -101,21 +101,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( + public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws Exception { // Try to retrieve tile context ComponentContext context = ComponentContext.getContext( request ); 1.3 +17 -16 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/SimpleSwitchLayoutAction.java Index: SimpleSwitchLayoutAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/SimpleSwitchLayoutAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SimpleSwitchLayoutAction.java 28 Feb 2003 02:23:05 -0000 1.2 +++ SimpleSwitchLayoutAction.java 21 Jul 2003 15:18:47 -0000 1.3 @@ -109,21 +109,22 @@ * already been completed. * This method should be implemented by subclasses. * - * @param context The current Tile context, containing Tile attributes - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { if(debug) System.out.println( "Enter SimpleSwitchLayoutAction" ); 1.3 +18 -16 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSwitchAction.java Index: LayoutSwitchAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSwitchAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LayoutSwitchAction.java 28 Feb 2003 02:23:05 -0000 1.2 +++ LayoutSwitchAction.java 21 Jul 2003 15:18:47 -0000 1.3 @@ -121,21 +121,23 @@ * already been completed. * This method should be implemented by subclasses. * - * @param context The current Tile context, containing Tile attributes - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { if(debug) System.out.println( "EnterLayoutSwitchAction" ); 1.3 +18 -16 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSettingsAction.java Index: LayoutSettingsAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSettingsAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LayoutSettingsAction.java 28 Feb 2003 02:23:05 -0000 1.2 +++ LayoutSettingsAction.java 21 Jul 2003 15:18:47 -0000 1.3 @@ -89,21 +89,23 @@ * already been completed. * This method should be implemented by subclasses. * - * @param context The current Tile context, containing Tile attributes - * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { if(debug) System.out.println("Enter action LayoutSettingAction"); 1.4 +13 -14 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/SetPortalPrefsAction.java Index: SetPortalPrefsAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/SetPortalPrefsAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SetPortalPrefsAction.java 28 Feb 2003 02:22:57 -0000 1.3 +++ SetPortalPrefsAction.java 21 Jul 2003 15:18:47 -0000 1.4 @@ -96,22 +96,21 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException - { + public ActionForward execute( + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception + { System.out.println("Enter action SetPortalPrefsAction"); HttpSession session = request.getSession(); PortalPrefsForm prefsForm = (PortalPrefsForm)form; 1.4 +11 -13 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/RetrievePortalAction.java Index: RetrievePortalAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/RetrievePortalAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RetrievePortalAction.java 28 Feb 2003 02:22:57 -0000 1.3 +++ RetrievePortalAction.java 21 Jul 2003 15:18:47 -0000 1.4 @@ -104,22 +104,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException - { + public ActionForward execute( + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { System.out.println("Enter action RetrievePortalAction"); // Get current session. HttpSession session = request.getSession(); 1.3 +7 -8 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/lang/SelectLocaleAction.java Index: SelectLocaleAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/lang/SelectLocaleAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SelectLocaleAction.java 28 Feb 2003 02:24:46 -0000 1.2 +++ SelectLocaleAction.java 21 Jul 2003 15:18:47 -0000 1.3 @@ -88,21 +88,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( + public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws Exception { // Extract parameters we will need String requested = (String)request.getParameter( "language" ); 1.3 +7 -8 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/SelectChannelAction.java Index: SelectChannelAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/SelectChannelAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SelectChannelAction.java 28 Feb 2003 02:24:46 -0000 1.2 +++ SelectChannelAction.java 21 Jul 2003 15:18:47 -0000 1.3 @@ -86,21 +86,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( + public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws Exception { // Extract parameters we will need String requested = (String)request.getParameter( "channel" ); 1.4 +23 -13 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java Index: RssChannelsAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RssChannelsAction.java 4 May 2003 22:41:12 -0000 1.3 +++ RssChannelsAction.java 21 Jul 2003 15:18:47 -0000 1.4 @@ -120,13 +120,23 @@ /** * Main process of class. Reads, parses + * @param context The current Tile context, containing Tile attributes. + * @param mapping The ActionMapping used to select this instance. + * @param form The optional ActionForm bean for this request (if any). + * @param request The HTTP request we are processing. + * @param response The HTTP response we are creating. + * + * @exception Exception if the application business logic throws + * an exception + * @since Struts 1.1 */ - public ActionForward perform( ComponentContext context, - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException + public ActionForward execute( + ComponentContext context, + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { //System.out.println("Enter action UserPortalAction"); if(debug) 1.3 +7 -9 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/tutorial/ForwardExampleAction.java Index: ForwardExampleAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/tutorial/ForwardExampleAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ForwardExampleAction.java 28 Feb 2003 02:24:49 -0000 1.2 +++ ForwardExampleAction.java 21 Jul 2003 15:18:48 -0000 1.3 @@ -81,22 +81,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( + public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException - { + throws Exception { String success = request.getParameter( "success" ); if( success != null ) return (mapping.findForward("success")); 1.3 +8 -9 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/invoice/EditInvoiceAction.java Index: EditInvoiceAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/invoice/EditInvoiceAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EditInvoiceAction.java 28 Feb 2003 02:24:46 -0000 1.2 +++ EditInvoiceAction.java 21 Jul 2003 15:18:48 -0000 1.3 @@ -95,21 +95,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( + public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws Exception { // Extract attributes we will need Locale locale = getLocale(request); 1.3 +8 -9 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/template/DynTemplateAction.java Index: DynTemplateAction.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/template/DynTemplateAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DynTemplateAction.java 28 Feb 2003 02:24:46 -0000 1.2 +++ DynTemplateAction.java 21 Jul 2003 15:18:48 -0000 1.3 @@ -87,21 +87,20 @@ * control should be forwarded, or <code>null</code> if the response has * already been completed. * - * @param servlet The ActionServlet making this request - * @param mapping The ActionMapping used to select this instance + * @param mapping The ActionMapping used to select this instance * @param actionForm The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs + * @exception Exception if the application business logic throws + * an exception */ - public ActionForward perform( + public ActionForward execute( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws Exception { System.out.println( "Start dynamic definition" ); // Create template definition
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]