You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/06/03 15:41:29 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/uri DataURI.java URI.java
henning 2003/06/03 06:41:29
Modified: src/java/org/apache/turbine/modules ActionLoader.java
LayoutLoader.java NavigationLoader.java
PageLoader.java ScheduledJobLoader.java
ScreenLoader.java
src/java/org/apache/turbine/modules/layouts JspLayout.java
VelocityDirectLayout.java VelocityECSLayout.java
VelocityOnlyLayout.java
src/java/org/apache/turbine/modules/pages JspPage.java
src/java/org/apache/turbine/modules/screens
VelocityDirectScreen.java
src/java/org/apache/turbine/om/security TurbineUser.java
src/java/org/apache/turbine/services/assemblerbroker
TurbineAssemblerBroker.java
src/java/org/apache/turbine/services/assemblerbroker/util/python
PythonBaseFactory.java
src/java/org/apache/turbine/services/jsp
TurbineJspService.java
src/java/org/apache/turbine/services/naming
TurbineNamingService.java
src/java/org/apache/turbine/services/pool
TurbinePoolService.java
src/java/org/apache/turbine/services/pull/tools
RelativeTemplateLink.java TemplateLink.java
TemplateLinkWithSlash.java
src/java/org/apache/turbine/services/pull/util
UIManager.java
src/java/org/apache/turbine/services/rundata
TurbineRunDataService.java
src/java/org/apache/turbine/services/security/torque
TorqueGroup.java TorquePermission.java
TorqueRole.java
src/java/org/apache/turbine/services/xslt
TurbineXSLTService.java
src/java/org/apache/turbine/util/security SecuritySet.java
src/java/org/apache/turbine/util/template
TemplateNavigation.java
src/java/org/apache/turbine/util/uri DataURI.java URI.java
Log:
Removed some unnecessary imports from the tree.
Revision Changes Path
1.9 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionLoader.java
Index: ActionLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActionLoader.java 9 Mar 2003 02:41:45 -0000 1.8
+++ ActionLoader.java 3 Jun 2003 13:41:25 -0000 1.9
@@ -61,12 +61,8 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
-
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.RunData;
1.9 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/modules/LayoutLoader.java
Index: LayoutLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/LayoutLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LayoutLoader.java 9 Mar 2003 02:41:45 -0000 1.8
+++ LayoutLoader.java 3 Jun 2003 13:41:25 -0000 1.9
@@ -62,8 +62,6 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
1.9 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/NavigationLoader.java
Index: NavigationLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/NavigationLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NavigationLoader.java 9 Mar 2003 02:41:45 -0000 1.8
+++ NavigationLoader.java 3 Jun 2003 13:41:25 -0000 1.9
@@ -63,12 +63,8 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
-
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.RunData;
1.7 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/PageLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PageLoader.java 9 Mar 2003 02:41:45 -0000 1.6
+++ PageLoader.java 3 Jun 2003 13:41:25 -0000 1.7
@@ -61,12 +61,8 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
-
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.RunData;
1.7 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
Index: ScheduledJobLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScheduledJobLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ScheduledJobLoader.java 9 Mar 2003 02:41:45 -0000 1.6
+++ ScheduledJobLoader.java 3 Jun 2003 13:41:25 -0000 1.7
@@ -61,14 +61,9 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
-
import org.apache.turbine.services.schedule.JobEntry;
-
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.RunData;
1.10 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java
Index: ScreenLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ScreenLoader.java 9 Mar 2003 02:41:45 -0000 1.9
+++ ScreenLoader.java 3 Jun 2003 13:41:25 -0000 1.10
@@ -63,12 +63,8 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
-
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.RunData;
1.7 +0 -1 jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/JspLayout.java
Index: JspLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/JspLayout.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspLayout.java 11 Mar 2003 13:53:52 -0000 1.6
+++ JspLayout.java 3 Jun 2003 13:41:26 -0000 1.7
@@ -56,7 +56,6 @@
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.Layout;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.jsp.TurbineJsp;
import org.apache.turbine.services.jsp.util.JspNavigation;
import org.apache.turbine.services.jsp.util.JspScreenPlaceholder;
1.8 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityDirectLayout.java
Index: VelocityDirectLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityDirectLayout.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocityDirectLayout.java 11 Mar 2003 13:54:11 -0000 1.7
+++ VelocityDirectLayout.java 3 Jun 2003 13:41:26 -0000 1.8
@@ -58,14 +58,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.modules.Layout;
-
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.velocity.VelocityService;
-
import org.apache.turbine.util.RunData;
-
import org.apache.turbine.util.template.TemplateNavigation;
import org.apache.turbine.util.template.TemplateScreen;
1.11 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityECSLayout.java
Index: VelocityECSLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityECSLayout.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VelocityECSLayout.java 11 Mar 2003 13:54:11 -0000 1.10
+++ VelocityECSLayout.java 3 Jun 2003 13:41:26 -0000 1.11
@@ -60,15 +60,10 @@
import org.apache.ecs.ConcreteElement;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.modules.Layout;
import org.apache.turbine.modules.ScreenLoader;
-
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.velocity.VelocityService;
-
import org.apache.turbine.util.RunData;
-
import org.apache.turbine.util.template.TemplateNavigation;
import org.apache.velocity.context.Context;
1.11 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java
Index: VelocityOnlyLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VelocityOnlyLayout.java 3 Jun 2003 13:21:52 -0000 1.10
+++ VelocityOnlyLayout.java 3 Jun 2003 13:41:26 -0000 1.11
@@ -60,15 +60,10 @@
import org.apache.ecs.ConcreteElement;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.modules.Layout;
import org.apache.turbine.modules.ScreenLoader;
-
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.velocity.VelocityService;
-
import org.apache.turbine.util.RunData;
-
import org.apache.turbine.util.template.TemplateNavigation;
import org.apache.velocity.context.Context;
1.5 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/JspPage.java
Index: JspPage.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/JspPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspPage.java 9 Mar 2003 02:41:46 -0000 1.4
+++ JspPage.java 3 Jun 2003 13:41:26 -0000 1.5
@@ -54,12 +54,7 @@
* <http://www.apache.org/>.
*/
-// Turbine Classes
-
-import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.jsp.TurbineJsp;
-
import org.apache.turbine.util.RunData;
/**
1.10 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
Index: VelocityDirectScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VelocityDirectScreen.java 11 Mar 2003 14:33:34 -0000 1.9
+++ VelocityDirectScreen.java 3 Jun 2003 13:41:26 -0000 1.10
@@ -55,22 +55,17 @@
*/
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.StringElement;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.services.template.TurbineTemplate;
-
import org.apache.turbine.services.velocity.TurbineVelocity;
-
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
1.15 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java
Index: TurbineUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineUser.java 22 Apr 2003 14:42:01 -0000 1.14
+++ TurbineUser.java 3 Jun 2003 13:41:26 -0000 1.15
@@ -65,7 +65,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.ObjectUtils;
/**
* A generic implementation of User interface.
1.4 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBroker.java
Index: TurbineAssemblerBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBroker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineAssemblerBroker.java 11 Mar 2003 16:38:44 -0000 1.3
+++ TurbineAssemblerBroker.java 3 Jun 2003 13:41:27 -0000 1.4
@@ -55,12 +55,8 @@
*/
import org.apache.turbine.modules.Assembler;
-
-import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
-
import org.apache.turbine.util.TurbineException;
/**
1.8 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
Index: PythonBaseFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PythonBaseFactory.java 11 Mar 2003 17:07:55 -0000 1.7
+++ PythonBaseFactory.java 3 Jun 2003 13:41:27 -0000 1.8
@@ -64,8 +64,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.modules.Assembler;
-import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
1.14 +0 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineJspService.java 7 May 2003 15:46:03 -0000 1.13
+++ TurbineJspService.java 3 Jun 2003 13:41:27 -0000 1.14
@@ -75,7 +75,6 @@
import org.apache.turbine.services.pull.tools.TemplateLink;
import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.services.template.BaseTemplateEngineService;
-import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
1.11 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
Index: TurbineNamingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/naming/TurbineNamingService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineNamingService.java 7 Apr 2003 16:04:26 -0000 1.10
+++ TurbineNamingService.java 3 Jun 2003 13:41:27 -0000 1.11
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
1.9 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/pool/TurbinePoolService.java
Index: TurbinePoolService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pool/TurbinePoolService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbinePoolService.java 9 Apr 2003 22:12:36 -0000 1.8
+++ TurbinePoolService.java 3 Jun 2003 13:41:27 -0000 1.9
@@ -67,7 +67,6 @@
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.factory.FactoryService;
import org.apache.turbine.services.factory.TurbineFactory;
import org.apache.turbine.util.TurbineException;
1.3 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java
Index: RelativeTemplateLink.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RelativeTemplateLink.java 7 May 2003 14:34:37 -0000 1.2
+++ RelativeTemplateLink.java 3 Jun 2003 13:41:27 -0000 1.3
@@ -56,8 +56,6 @@
import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.util.RunData;
-
/**
* This is exactly the same thing as TemplateLink but it returns a
* relative link on toString(). Everything else is identical. This class is
1.5 +1 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
Index: TemplateLink.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TemplateLink.java 27 May 2003 20:47:03 -0000 1.4
+++ TemplateLink.java 3 Jun 2003 13:41:27 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,7 +61,6 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.uri.TemplateURI;
-import org.apache.turbine.util.uri.URIConstants;
/**
* This is a pull to to be used in Templates to convert links in
1.3 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java
Index: TemplateLinkWithSlash.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateLinkWithSlash.java 7 May 2003 14:34:37 -0000 1.2
+++ TemplateLinkWithSlash.java 3 Jun 2003 13:41:27 -0000 1.3
@@ -55,7 +55,6 @@
*/
import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.util.RunData;
/**
* This class allows one to specify paths in the setPage method
1.9 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/util/UIManager.java
Index: UIManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/util/UIManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UIManager.java 7 May 2003 15:48:01 -0000 1.8
+++ UIManager.java 3 Jun 2003 13:41:27 -0000 1.9
@@ -65,7 +65,6 @@
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.services.pull.TurbinePull;
-import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.uri.DataURI;
1.14 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineRunDataService.java 9 May 2003 11:03:50 -0000 1.13
+++ TurbineRunDataService.java 3 Jun 2003 13:41:28 -0000 1.14
@@ -66,7 +66,6 @@
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.pool.PoolService;
import org.apache.turbine.services.pool.TurbinePool;
import org.apache.turbine.util.RunData;
1.4 +3 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java
Index: TorqueGroup.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TorqueGroup.java 8 Apr 2003 09:50:35 -0000 1.3
+++ TorqueGroup.java 3 Jun 2003 13:41:28 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.sql.Connection;
-
import java.util.Iterator;
import org.apache.torque.om.Persistent;
@@ -116,7 +114,8 @@
/**
* The package private Constructor is used when the GroupPeerManager
* has retrieved a list of Database Objects from the peer and
- * must 'wrap' them into TorqueGroup Objects. You should not use it directly!
+ * must 'wrap' them into TorqueGroup Objects.
+ * You should not use it directly!
*
* @param obj An Object from the peer
*/
1.4 +3 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorquePermission.java
Index: TorquePermission.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorquePermission.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TorquePermission.java 8 Apr 2003 09:50:35 -0000 1.3
+++ TorquePermission.java 3 Jun 2003 13:41:28 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.sql.Connection;
-
import org.apache.torque.om.Persistent;
import org.apache.turbine.om.security.Permission;
@@ -102,7 +100,8 @@
/**
* The package private Constructor is used when the PermissionPeerManager
* has retrieved a list of Database Objects from the peer and
- * must 'wrap' them into TorquePermission Objects. You should not use it directly!
+ * must 'wrap' them into TorquePermission Objects.
+ * You should not use it directly!
*
* @param obj An Object from the peer
*/
1.4 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueRole.java
Index: TorqueRole.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/TorqueRole.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TorqueRole.java 8 Apr 2003 09:50:35 -0000 1.3
+++ TorqueRole.java 3 Jun 2003 13:41:28 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.sql.Connection;
-
import java.util.Iterator;
import org.apache.turbine.om.security.Permission;
1.10 +0 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/xslt/TurbineXSLTService.java
Index: TurbineXSLTService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xslt/TurbineXSLTService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineXSLTService.java 9 Apr 2003 22:30:04 -0000 1.9
+++ TurbineXSLTService.java 3 Jun 2003 13:41:28 -0000 1.10
@@ -78,7 +78,6 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.TurbineServices;
import org.w3c.dom.Node;
1.3 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/util/security/SecuritySet.java
Index: SecuritySet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/security/SecuritySet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecuritySet.java 8 Apr 2003 13:15:32 -0000 1.2
+++ SecuritySet.java 3 Jun 2003 13:41:28 -0000 1.3
@@ -55,17 +55,13 @@
*/
import java.io.Serializable;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import java.util.TreeSet;
import org.apache.commons.lang.StringUtils;
-
-import org.apache.turbine.om.security.SecurityEntity;
/**
* This class represents a set of Security Entities.
1.9 +1 -4 jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateNavigation.java
Index: TemplateNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateNavigation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TemplateNavigation.java 19 Mar 2003 09:22:30 -0000 1.8
+++ TemplateNavigation.java 3 Jun 2003 13:41:28 -0000 1.9
@@ -57,13 +57,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
-
import org.apache.ecs.ConcreteElement;
import org.apache.turbine.modules.NavigationLoader;
-import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
1.3 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/util/uri/DataURI.java
Index: DataURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/uri/DataURI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataURI.java 15 May 2003 18:06:23 -0000 1.2
+++ DataURI.java 3 Jun 2003 13:41:29 -0000 1.3
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.ServerData;
1.2 +1 -14 jakarta-turbine-2/src/java/org/apache/turbine/util/uri/URI.java
Index: URI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/uri/URI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URI.java 7 May 2003 16:02:02 -0000 1.1
+++ URI.java 3 Jun 2003 13:41:29 -0000 1.2
@@ -54,19 +54,6 @@
* <http://www.apache.org/>.
*/
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.turbine.Turbine;
-import org.apache.turbine.TurbineConstants;
-
-import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.ServerData;
-
/**
* An interface class which describes the absolute minimum of methods that
* a Turbine URI class must implement.
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org