jmitchell 2002/11/15 20:58:48 Modified: src/tiles-documentation/org/apache/struts/webapp/tiles/channel ChannelFactorySet.java src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal RetrievePortalAction.java SetPortalPrefsAction.java src/test/org/apache/struts/action TestActionMessage.java TestActionMessages.java TestActionServlet.java TestDynaActionForm.java TestDynaActionFormClass.java src/tiles-documentation/org/apache/struts/webapp/tiles/test TestActionTileAction.java src/test/org/apache/struts/taglib/logic TestEqualTag.java TestNotEqualTag.java TestNotPresentTag.java TestPresentTag.java src/test/org/apache/struts/mock TestMockBase.java src/tiles-documentation/org/apache/struts/webapp/tiles/portal UserMenuAction.java UserMenuSettingsAction.java UserPortalAction.java UserPortalSettingsAction.java Log: Cleaning up imports Revision Changes Path 1.2 +16 -19 jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/ChannelFactorySet.java Index: ChannelFactorySet.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/ChannelFactorySet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChannelFactorySet.java 11 Jul 2002 15:35:21 -0000 1.1 +++ ChannelFactorySet.java 16 Nov 2002 04:58:47 -0000 1.2 @@ -61,27 +61,24 @@ package org.apache.struts.webapp.tiles.channel; -import org.apache.struts.tiles.DefinitionsFactoryException; -import org.apache.struts.tiles.FactoryNotFoundException; -import org.apache.struts.tiles.DefinitionsUtil; -import org.apache.struts.tiles.xmlDefinition.*; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; -import javax.servlet.ServletRequest; import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; -import java.util.Map; -import java.util.Locale; -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.StringTokenizer; -import java.io.InputStream; -import java.io.IOException; -import java.io.FileNotFoundException; - +import org.apache.struts.tiles.DefinitionsFactoryException; +import org.apache.struts.tiles.DefinitionsUtil; +import org.apache.struts.tiles.FactoryNotFoundException; +import org.apache.struts.tiles.xmlDefinition.DefinitionsFactory; +import org.apache.struts.tiles.xmlDefinition.FactorySet; +import org.apache.struts.tiles.xmlDefinition.XmlDefinitionsSet; +import org.apache.struts.tiles.xmlDefinition.XmlParser; import org.xml.sax.SAXException; /** 1.2 +6 -12 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RetrievePortalAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ RetrievePortalAction.java 16 Nov 2002 04:58:47 -0000 1.2 @@ -61,25 +61,19 @@ package org.apache.struts.webapp.tiles.dynPortal; -import org.apache.struts.tiles.*; - import java.io.IOException; -import java.util.Locale; -//import java.util.Vector; import java.util.List; -import javax.servlet.RequestDispatcher; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; /** 1.2 +7 -13 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SetPortalPrefsAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ SetPortalPrefsAction.java 16 Nov 2002 04:58:47 -0000 1.2 @@ -61,24 +61,18 @@ package org.apache.struts.webapp.tiles.dynPortal; -import org.apache.struts.tiles.*; - import java.io.IOException; -import java.util.Locale; -import java.util.Vector; -import javax.servlet.RequestDispatcher; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; /** 1.2 +2 -2 jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java Index: TestActionMessage.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionMessage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestActionMessage.java 22 Jun 2002 20:50:36 -0000 1.1 +++ TestActionMessage.java 16 Nov 2002 04:58:47 -0000 1.2 @@ -55,7 +55,7 @@ package org.apache.struts.action; -import junit.framework.*; +import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; /** * Unit tests for the <code>org.apache.struts.action.ActionMessage</code> class. 1.4 +5 -2 jakarta-struts/src/test/org/apache/struts/action/TestActionMessages.java Index: TestActionMessages.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionMessages.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestActionMessages.java 20 Oct 2002 19:04:04 -0000 1.3 +++ TestActionMessages.java 16 Nov 2002 04:58:47 -0000 1.4 @@ -55,8 +55,11 @@ package org.apache.struts.action; -import junit.framework.*; import java.util.Iterator; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Unit tests for the <code>org.apache.struts.action.ActionMessages</code> class. 1.4 +4 -4 jakarta-struts/src/test/org/apache/struts/action/TestActionServlet.java Index: TestActionServlet.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestActionServlet.java 16 Jun 2002 00:37:12 -0000 1.3 +++ TestActionServlet.java 16 Nov 2002 04:58:47 -0000 1.4 @@ -54,11 +54,11 @@ */ package org.apache.struts.action; -import javax.servlet.*; - -import junit.framework.*; -import org.apache.cactus.*; +import javax.servlet.ServletException; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.apache.cactus.ServletTestCase; import org.apache.struts.util.MessageResources; /** 1.7 +6 -5 jakarta-struts/src/test/org/apache/struts/action/TestDynaActionForm.java Index: TestDynaActionForm.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestDynaActionForm.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TestDynaActionForm.java 7 Nov 2002 07:01:21 -0000 1.6 +++ TestDynaActionForm.java 16 Nov 2002 04:58:47 -0000 1.7 @@ -59,14 +59,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.*; -import junit.framework.*; -import org.apache.cactus.*; + +import javax.servlet.ServletRequest; +import junit.framework.Test; +import junit.framework.TestSuite; + import org.apache.commons.beanutils.DynaProperty; -import org.apache.struts.action.ActionMapping; import org.apache.struts.config.ApplicationConfig; -import org.apache.struts.config.ModuleConfig; import org.apache.struts.config.FormBeanConfig; +import org.apache.struts.config.ModuleConfig; /** 1.6 +4 -3 jakarta-struts/src/test/org/apache/struts/action/TestDynaActionFormClass.java Index: TestDynaActionFormClass.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestDynaActionFormClass.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- TestDynaActionFormClass.java 10 Jul 2002 20:36:23 -0000 1.5 +++ TestDynaActionFormClass.java 16 Nov 2002 04:58:47 -0000 1.6 @@ -54,10 +54,11 @@ */ package org.apache.struts.action; -import javax.servlet.*; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils.DynaProperty; -import org.apache.struts.action.DynaActionFormClass; import org.apache.struts.config.FormBeanConfig; import org.apache.struts.config.FormPropertyConfig; 1.2 +11 -13 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestActionTileAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ TestActionTileAction.java 16 Nov 2002 04:58:47 -0000 1.2 @@ -61,24 +61,22 @@ package org.apache.struts.webapp.tiles.test; -import org.apache.struts.tiles.*; - import java.io.IOException; -import java.util.Locale; -import java.util.Vector; -import javax.servlet.RequestDispatcher; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; + import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.ComponentDefinition; +import org.apache.struts.tiles.DefinitionsFactoryException; +import org.apache.struts.tiles.DefinitionsUtil; +import org.apache.struts.tiles.FactoryNotFoundException; +import org.apache.struts.tiles.NoSuchDefinitionException; /** 1.4 +1 -7 jakarta-struts/src/test/org/apache/struts/taglib/logic/TestEqualTag.java Index: TestEqualTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestEqualTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestEqualTag.java 22 Jun 2002 21:34:33 -0000 1.3 +++ TestEqualTag.java 16 Nov 2002 04:58:47 -0000 1.4 @@ -54,13 +54,7 @@ */ package org.apache.struts.taglib.logic; -import javax.servlet.*; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; - -import junit.framework.*; -import org.apache.cactus.*; +import javax.servlet.ServletException; import javax.servlet.jsp.JspException; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.cactus.JspTestCase; import org.apache.cactus.WebRequest; /** * Suite of unit tests for the 1.2 +1 -6 jakarta-struts/src/test/org/apache/struts/taglib/logic/TestNotEqualTag.java Index: TestNotEqualTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestNotEqualTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestNotEqualTag.java 22 Jun 2002 21:39:51 -0000 1.1 +++ TestNotEqualTag.java 16 Nov 2002 04:58:47 -0000 1.2 @@ -54,12 +54,7 @@ */ package org.apache.struts.taglib.logic; -import javax.servlet.*; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - -import junit.framework.*; -import org.apache.cactus.*; +import javax.servlet.ServletException; import javax.servlet.jsp.PageContext; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.cactus.JspTestCase; import org.apache.cactus.WebRequest; /** * Suite of unit tests for the 1.5 +1 -7 jakarta-struts/src/test/org/apache/struts/taglib/logic/TestNotPresentTag.java Index: TestNotPresentTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestNotPresentTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TestNotPresentTag.java 16 Jun 2002 04:02:38 -0000 1.4 +++ TestNotPresentTag.java 16 Nov 2002 04:58:48 -0000 1.5 @@ -54,13 +54,7 @@ */ package org.apache.struts.taglib.logic; -import javax.servlet.*; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - - -import junit.framework.*; -import org.apache.cactus.*; +import javax.servlet.ServletException; import javax.servlet.jsp.PageContext; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.cactus.JspTestCase; import org.apache.cactus.WebRequest; /** * Suite of unit tests for the 1.5 +1 -7 jakarta-struts/src/test/org/apache/struts/taglib/logic/TestPresentTag.java Index: TestPresentTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestPresentTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TestPresentTag.java 16 Jun 2002 04:02:38 -0000 1.4 +++ TestPresentTag.java 16 Nov 2002 04:58:48 -0000 1.5 @@ -54,13 +54,7 @@ */ package org.apache.struts.taglib.logic; -import javax.servlet.*; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; - - -import junit.framework.*; -import org.apache.cactus.*; +import javax.servlet.ServletException; import javax.servlet.jsp.PageContext; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.cactus.JspTestCase; import org.apache.cactus.WebRequest; /** * Suite of unit tests for the 1.7 +8 -5 jakarta-struts/src/test/org/apache/struts/mock/TestMockBase.java Index: TestMockBase.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/mock/TestMockBase.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TestMockBase.java 18 Oct 2002 15:27:43 -0000 1.6 +++ TestMockBase.java 16 Nov 2002 04:58:48 -0000 1.7 @@ -63,7 +63,10 @@ package org.apache.struts.mock; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.struts.action.Action; import org.apache.struts.action.ActionFormBean; import org.apache.struts.action.ActionForward; 1.2 +13 -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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UserMenuAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ UserMenuAction.java 16 Nov 2002 04:58:48 -0000 1.2 @@ -61,30 +61,26 @@ package org.apache.struts.webapp.tiles.portal; -import org.apache.struts.tiles.*; -import org.apache.struts.tiles.actions.TilesAction; -import org.apache.struts.tiles.Controller; -import org.apache.struts.tiles.beans.MenuItem; -import org.apache.struts.tiles.DefinitionsUtil; - import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; -import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.ComponentDefinition; +import org.apache.struts.tiles.Controller; +import org.apache.struts.tiles.DefinitionsUtil; +import org.apache.struts.tiles.actions.TilesAction; +import org.apache.struts.tiles.beans.MenuItem; /** 1.2 +8 -15 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UserMenuSettingsAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ UserMenuSettingsAction.java 16 Nov 2002 04:58:48 -0000 1.2 @@ -61,28 +61,21 @@ package org.apache.struts.webapp.tiles.portal; -import org.apache.struts.action.Action; -import org.apache.struts.tiles.*; -import org.apache.struts.tiles.actions.TilesAction; -import org.apache.struts.tiles.beans.MenuItem; - import java.io.IOException; -import java.util.List; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.actions.TilesAction; +import org.apache.struts.tiles.beans.MenuItem; /** * Tiles controller as Struts Action. 1.2 +9 -15 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UserPortalAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ UserPortalAction.java 16 Nov 2002 04:58:48 -0000 1.2 @@ -61,26 +61,20 @@ package org.apache.struts.webapp.tiles.portal; -import org.apache.struts.tiles.*; -import org.apache.struts.tiles.actions.TilesAction; - import java.io.IOException; -import java.util.Locale; -//import java.util.Vector; import java.util.List; -import javax.servlet.RequestDispatcher; + +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.actions.TilesAction; /** 1.2 +7 -14 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UserPortalSettingsAction.java 11 Jul 2002 15:35:20 -0000 1.1 +++ UserPortalSettingsAction.java 16 Nov 2002 04:58:48 -0000 1.2 @@ -61,24 +61,17 @@ package org.apache.struts.webapp.tiles.portal; -import org.apache.struts.tiles.*; -import org.apache.struts.tiles.actions.TilesAction; - import java.io.IOException; -import java.util.Locale; -import java.util.Vector; -import javax.servlet.RequestDispatcher; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; - -import org.apache.struts.util.RequestUtils; +import org.apache.struts.tiles.ComponentContext; +import org.apache.struts.tiles.actions.TilesAction; /**
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>