You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/05/05 16:44:00 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/schedule JobEntry.java JobEntryPeer.java JobQueue.java ScheduleService.java TurbineNonPersistentSchedulerService.java TurbineSchedulerService.java WorkerThread.java
jvanzyl 01/05/05 07:44:00
Modified: src/java/org/apache/turbine/services/jsp/tags
BodyAttributesTag.java BodyTag.java HeadTag.java
NavigationTag.java ScreenTag.java
TemplateLinkTag.java
src/java/org/apache/turbine/services/jsp/util JspLink.java
JspNavigation.java JspScreenPlaceholder.java
src/java/org/apache/turbine/services/localization
LocaleDetector.java Localization.java
LocalizationService.java
TurbineLocalizationService.java
src/java/org/apache/turbine/services/logging
BaseRunDataFilter.java FileLogger.java
Log4JavaLogger.java LoggingConfig.java
LoggingService.java PropertiesLoggingConfig.java
RunDataFilter.java ServletLogger.java
ServletLoggingService.java TurbineLogging.java
TurbineLoggingService.java
src/java/org/apache/turbine/services/naming
NamingService.java TurbineNamingService.java
src/java/org/apache/turbine/services/resources
ResourceService.java TurbineResourceService.java
TurbineResources.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
src/java/org/apache/turbine/services/schedule JobEntry.java
JobEntryPeer.java JobQueue.java
ScheduleService.java
TurbineNonPersistentSchedulerService.java
TurbineSchedulerService.java WorkerThread.java
Log:
- qualifying imports
Revision Changes Path
1.3 +4 -3 jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/BodyAttributesTag.java
Index: BodyAttributesTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/BodyAttributesTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BodyAttributesTag.java 2001/03/06 06:12:15 1.2
+++ BodyAttributesTag.java 2001/05/05 14:43:55 1.3
@@ -54,9 +54,10 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
/**
* Supporting class for the bodyAttributes tag.
1.4 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/BodyTag.java
Index: BodyTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/BodyTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BodyTag.java 2001/03/06 06:12:16 1.3
+++ BodyTag.java 2001/05/05 14:43:55 1.4
@@ -54,9 +54,9 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
/**
* Supporting class for the body tag.
1.4 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/HeadTag.java
Index: HeadTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/HeadTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HeadTag.java 2001/03/06 06:12:16 1.3
+++ HeadTag.java 2001/05/05 14:43:55 1.4
@@ -54,9 +54,9 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
/**
* Supporting class for the head tag.
1.4 +9 -9 jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/NavigationTag.java
Index: NavigationTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/NavigationTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NavigationTag.java 2001/03/06 06:12:16 1.3
+++ NavigationTag.java 2001/05/05 14:43:55 1.4
@@ -54,17 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-
-// Turbine Classes
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
import org.apache.turbine.modules.NavigationLoader;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.template.TemplateService;
-import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.TurbineServices;
-
+import org.apache.turbine.services.jsp.JspService;
+import org.apache.turbine.services.template.TemplateService;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.template.TemplateInfo;
/**
* Supporting class for the bodyAttributes tag.
1.5 +9 -9 jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/ScreenTag.java
Index: ScreenTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/ScreenTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScreenTag.java 2001/03/06 06:12:16 1.4
+++ ScreenTag.java 2001/05/05 14:43:55 1.5
@@ -54,17 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-
-// Turbine Classes
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
import org.apache.turbine.modules.ScreenLoader;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.template.TemplateService;
-import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.TurbineServices;
-
+import org.apache.turbine.services.jsp.JspService;
+import org.apache.turbine.services.template.TemplateService;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.template.TemplateInfo;
/**
* Supporting class for the screen tag.
1.3 +6 -6 jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/TemplateLinkTag.java
Index: TemplateLinkTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/TemplateLinkTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateLinkTag.java 2001/03/06 06:12:17 1.2
+++ TemplateLinkTag.java 2001/05/05 14:43:55 1.3
@@ -54,15 +54,15 @@
* <http://www.apache.org/>.
*/
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-
-// Turbine Classes
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.turbine.services.jsp.JspService;
+import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.template.TemplateLink;
-import org.apache.turbine.services.jsp.JspService;
/**
* Supporting class for the TemplateLink tag.
1.3 +2 -11 jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspLink.java
Index: JspLink.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspLink.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspLink.java 2001/03/06 06:12:19 1.2
+++ JspLink.java 2001/05/05 14:43:55 1.3
@@ -54,17 +54,8 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.net.*;
-import java.util.*;
-
-//Servlet Classes
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-//Turbine Classes
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.RunData;
/**
* A customized version of the DynamicURI to be used in JSP templates.
1.3 +6 -7 jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java
Index: JspNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspNavigation.java 2001/03/06 06:12:19 1.2
+++ JspNavigation.java 2001/05/05 14:43:56 1.3
@@ -54,14 +54,13 @@
* <http://www.apache.org/>.
*/
-
-// Turbine Utility Classes
+import java.io.IOException;
import org.apache.turbine.modules.NavigationLoader;
-import org.apache.turbine.util.*;
-import org.apache.ecs.ConcreteElement;
-import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.TurbineServices;
-
+import org.apache.turbine.services.template.TemplateService;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.template.TemplateInfo;
/**
* Returns output of a Navigation module. An instance of this is placed in the
@@ -72,7 +71,7 @@
* <%useBean id="navigation" class="JspNavigation" scope="request"/%>
* ...
* <%= navigation.setTemplate("admin_navigation.jsp") %>
- *</code>
+ * </code>
* @author <a href="john.mcnally@clearink.com">John D. McNally</a>
* @author Dave Bryson<a href="mbryson@mont.mindspring.com">mbryson@mont.mindspring.com</a>
*
1.3 +5 -6 jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java
Index: JspScreenPlaceholder.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspScreenPlaceholder.java 2001/03/06 06:12:20 1.2
+++ JspScreenPlaceholder.java 2001/05/05 14:43:56 1.3
@@ -54,14 +54,13 @@
* <http://www.apache.org/>.
*/
-
-// Turbine Utility Classes
+import java.io.IOException;
import org.apache.turbine.modules.ScreenLoader;
-import org.apache.turbine.util.*;
-import org.apache.ecs.ConcreteElement;
-import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.TurbineServices;
-
+import org.apache.turbine.services.template.TemplateService;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.template.TemplateInfo;
/**
* Returns output of a Navigation module. An instance of this is placed in the
1.4 +5 -6 jakarta-turbine/src/java/org/apache/turbine/services/localization/LocaleDetector.java
Index: LocaleDetector.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/LocaleDetector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocaleDetector.java 2001/03/06 06:12:21 1.3
+++ LocaleDetector.java 2001/05/05 14:43:56 1.4
@@ -54,12 +54,11 @@
* <http://www.apache.org/>.
*/
-// Java stuff.
-import java.util.*;
-
-// Turbine stuff.
-import org.apache.turbine.util.*;
+import java.util.Locale;
+import java.util.StringTokenizer;
+import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.turbine.util.RunData;
/**
* This class returns a Locale object based on the HTTP
@@ -70,7 +69,7 @@
*
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:jon@collab.net">Jon S. Stevens</a>
- * @version $Id: LocaleDetector.java,v 1.3 2001/03/06 06:12:21 chrise Exp $
+ * @version $Id: LocaleDetector.java,v 1.4 2001/05/05 14:43:56 jvanzyl Exp $
*/
public class LocaleDetector
{
1.6 +7 -7 jakarta-turbine/src/java/org/apache/turbine/services/localization/Localization.java
Index: Localization.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/Localization.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Localization.java 2001/03/06 06:12:22 1.5
+++ Localization.java 2001/05/05 14:43:56 1.6
@@ -54,13 +54,13 @@
* <http://www.apache.org/>.
*/
-// Java stuff.
-import java.util.*;
-
-// Turbine stuff.
-import org.apache.turbine.util.RunData;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import org.apache.turbine.services.Service;
+import org.apache.turbine.services.ServiceBroker;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.*;
+import org.apache.turbine.util.RunData;
/**
* Wrapper around the TurbineLocalization Service that makes it easy
@@ -84,7 +84,7 @@
* Localization.getString(str)
*
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
- * @version $Id: Localization.java,v 1.5 2001/03/06 06:12:22 chrise Exp $
+ * @version $Id: Localization.java,v 1.6 2001/05/05 14:43:56 jvanzyl Exp $
*/
public class Localization
{
1.6 +3 -5 jakarta-turbine/src/java/org/apache/turbine/services/localization/LocalizationService.java
Index: LocalizationService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/LocalizationService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalizationService.java 2001/04/08 16:41:08 1.5
+++ LocalizationService.java 2001/05/05 14:43:56 1.6
@@ -54,10 +54,8 @@
* <http://www.apache.org/>.
*/
-// Java stuff.
-import java.util.*;
-
-// Turbine stuff.
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.Service;
@@ -65,7 +63,7 @@
* Implementations of the LocalizationService interface.
*
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
- * @version $Id: LocalizationService.java,v 1.5 2001/04/08 16:41:08 ilkka Exp $
+ * @version $Id: LocalizationService.java,v 1.6 2001/05/05 14:43:56 jvanzyl Exp $
*/
public interface LocalizationService
extends Service
1.6 +6 -7 jakarta-turbine/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineLocalizationService.java 2001/03/06 06:12:22 1.5
+++ TurbineLocalizationService.java 2001/05/05 14:43:56 1.6
@@ -54,13 +54,12 @@
* <http://www.apache.org/>.
*/
-// Java stuff.
-import java.util.*;
-
-// Turbine stuff.
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.turbine.util.RunData;
/**
* This class has been added 17.01.2000 by [jm],mediaphil digital
@@ -93,7 +92,7 @@
* @author <a href="mailto:jm@mediaphil.de">Jonas Maurus</a>
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
- * @version $Id: TurbineLocalizationService.java,v 1.5 2001/03/06 06:12:22 chrise Exp $
+ * @version $Id: TurbineLocalizationService.java,v 1.6 2001/05/05 14:43:56 jvanzyl Exp $
*/
public class TurbineLocalizationService
extends TurbineBaseService
1.8 +15 -6 jakarta-turbine/src/java/org/apache/turbine/services/logging/BaseRunDataFilter.java
Index: BaseRunDataFilter.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/BaseRunDataFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseRunDataFilter.java 2001/04/12 02:22:58 1.7
+++ BaseRunDataFilter.java 2001/05/05 14:43:56 1.8
@@ -54,11 +54,20 @@
* <http://www.apache.org/>.
*/
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.*;
-import java.lang.reflect.*;
-
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUtils;
+import org.apache.turbine.om.security.User;
import org.apache.turbine.util.RunData;
/**
@@ -100,7 +109,7 @@
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:Michal.Majdan@e-point.pl">Michal Majdan</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: BaseRunDataFilter.java,v 1.7 2001/04/12 02:22:58 mpoeschl Exp $
+ * @version $Id: BaseRunDataFilter.java,v 1.8 2001/05/05 14:43:56 jvanzyl Exp $
*/
public class BaseRunDataFilter implements RunDataFilter
{
1.11 +10 -7 jakarta-turbine/src/java/org/apache/turbine/services/logging/FileLogger.java
Index: FileLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/FileLogger.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileLogger.java 2001/04/12 02:30:18 1.10
+++ FileLogger.java 2001/05/05 14:43:56 1.11
@@ -54,15 +54,18 @@
* <http://www.apache.org/>.
*/
-
-// Java Core Classes
+import java.io.ByteArrayOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Vector;
-import java.util.*;
-import java.io.*;
-
import javax.servlet.ServletContext;
-
import org.apache.turbine.util.RunData;
/**
@@ -72,7 +75,7 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: FileLogger.java,v 1.10 2001/04/12 02:30:18 mpoeschl Exp $
+ * @version $Id: FileLogger.java,v 1.11 2001/05/05 14:43:56 jvanzyl Exp $
*/
public class FileLogger extends BaseLogger
{
1.11 +19 -10 jakarta-turbine/src/java/org/apache/turbine/services/logging/Log4JavaLogger.java
Index: Log4JavaLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/Log4JavaLogger.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Log4JavaLogger.java 2001/04/12 02:30:19 1.10
+++ Log4JavaLogger.java 2001/05/05 14:43:56 1.11
@@ -54,19 +54,28 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
-import org.apache.log4j.*;
-import org.apache.log4j.net.*;
-import org.apache.log4j.spi.*;
-
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
import javax.servlet.ServletContext;
-
+import org.apache.log4j.Appender;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Category;
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.Priority;
+import org.apache.log4j.RollingFileAppender;
+import org.apache.log4j.net.SMTPAppender;
+import org.apache.log4j.net.SocketAppender;
+import org.apache.log4j.net.SyslogAppender;
+import org.apache.turbine.services.logging.jdbc.JDBCAppender;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.logging.jdbc.*;
-
/**
* Class implements the Logger interface using log4java package
* Messages can be written to following destination:
@@ -84,7 +93,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: Log4JavaLogger.java,v 1.10 2001/04/12 02:30:19 mpoeschl Exp $
+ * @version $Id: Log4JavaLogger.java,v 1.11 2001/05/05 14:43:56 jvanzyl Exp $
*/
public class Log4JavaLogger extends BaseLogger
{
1.7 +3 -5 jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingConfig.java
Index: LoggingConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoggingConfig.java 2001/04/12 02:22:58 1.6
+++ LoggingConfig.java 2001/05/05 14:43:56 1.7
@@ -54,18 +54,16 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.util.*;
+import java.util.Vector;
+import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.*;
-
/**
* This is the interface that one must implement if they wish to
* provide alternative configuration resources for the Logging
* system.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: LoggingConfig.java,v 1.6 2001/04/12 02:22:58 mpoeschl Exp $
+ * @version $Id: LoggingConfig.java,v 1.7 2001/05/05 14:43:56 jvanzyl Exp $
*/
public interface LoggingConfig
{
1.9 +3 -9 jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingService.java
Index: LoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LoggingService.java 2001/04/12 02:22:58 1.8
+++ LoggingService.java 2001/05/05 14:43:57 1.9
@@ -54,15 +54,9 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.services.Service;
+import org.apache.turbine.util.RunData;
-// Java Core Classes
-import java.util.*;
-import java.io.*;
-
-// Turbine Services Classes
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-
/**
* A service that provides logging capabilities to Turbine.
* <p>
@@ -73,7 +67,7 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: LoggingService.java,v 1.8 2001/04/12 02:22:58 mpoeschl Exp $
+ * @version $Id: LoggingService.java,v 1.9 2001/05/05 14:43:57 jvanzyl Exp $
*/
public interface LoggingService extends Service
{
1.7 +5 -6 jakarta-turbine/src/java/org/apache/turbine/services/logging/PropertiesLoggingConfig.java
Index: PropertiesLoggingConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/PropertiesLoggingConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PropertiesLoggingConfig.java 2001/04/06 18:41:52 1.6
+++ PropertiesLoggingConfig.java 2001/05/05 14:43:57 1.7
@@ -54,19 +54,18 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.resources.ResourceService;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.resources.*;
-
/**
* Small helper class that encapsulates the logging configuration
* information. This class reads its information from a Properties
* file.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: PropertiesLoggingConfig.java,v 1.6 2001/04/06 18:41:52 jvanzyl Exp $
+ * @version $Id: PropertiesLoggingConfig.java,v 1.7 2001/05/05 14:43:57 jvanzyl Exp $
*/
public class PropertiesLoggingConfig implements LoggingConfig
{
1.4 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/logging/RunDataFilter.java
Index: RunDataFilter.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/RunDataFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RunDataFilter.java 2001/03/06 06:12:28 1.3
+++ RunDataFilter.java 2001/05/05 14:43:57 1.4
@@ -54,16 +54,15 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.*;
-
/**
* Classes that implement this interface extracts data from RunData object.
* The data should be formatted according to user's preference and retuned
* as a string.
*
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
- * @version $Id: RunDataFilter.java,v 1.3 2001/03/06 06:12:28 chrise Exp $
+ * @version $Id: RunDataFilter.java,v 1.4 2001/05/05 14:43:57 jvanzyl Exp $
*/
public interface RunDataFilter
{
1.9 +1 -6 jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLogger.java
Index: ServletLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLogger.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServletLogger.java 2001/04/12 02:22:58 1.8
+++ ServletLogger.java 2001/05/05 14:43:57 1.9
@@ -54,13 +54,8 @@
* <http://www.apache.org/>.
*/
-
-// Java Core Classes
-import java.io.*;
import java.util.Date;
-
import javax.servlet.ServletContext;
-
import org.apache.turbine.util.RunData;
/**
@@ -71,7 +66,7 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: ServletLogger.java,v 1.8 2001/04/12 02:22:58 mpoeschl Exp $
+ * @version $Id: ServletLogger.java,v 1.9 2001/05/05 14:43:57 jvanzyl Exp $
*/
public class ServletLogger extends BaseLogger
{
1.9 +4 -11 jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLoggingService.java
Index: ServletLoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLoggingService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServletLoggingService.java 2001/04/12 02:22:58 1.8
+++ ServletLoggingService.java 2001/05/05 14:43:57 1.9
@@ -54,18 +54,11 @@
* <http://www.apache.org/>.
*/
-
-// Java Core Classes
-import java.util.*;
-import java.io.*;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import java.util.Hashtable;
-
-// Turbine Services Classes
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-
+import org.apache.turbine.services.BaseInitable;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.util.RunData;
/**
* This service functions as a simple logger provider (with only one logger).
@@ -76,7 +69,7 @@
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: ServletLoggingService.java,v 1.8 2001/04/12 02:22:58 mpoeschl Exp $
+ * @version $Id: ServletLoggingService.java,v 1.9 2001/05/05 14:43:57 jvanzyl Exp $
*/
public class ServletLoggingService
extends TurbineLoggingService
1.9 +3 -7 jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLogging.java
Index: TurbineLogging.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLogging.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineLogging.java 2001/04/12 02:30:19 1.8
+++ TurbineLogging.java 2001/05/05 14:43:57 1.9
@@ -54,19 +54,15 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.util.RunData;
-// Turbine stuff.
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-
/**
* This is a facade class for {@link TurbineLoggingService}.
*
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineLogging.java,v 1.8 2001/04/12 02:30:19 mpoeschl Exp $
+ * @version $Id: TurbineLogging.java,v 1.9 2001/05/05 14:43:57 jvanzyl Exp $
*/
public class TurbineLogging
{
1.12 +10 -10 jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java
Index: TurbineLoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TurbineLoggingService.java 2001/04/12 02:22:58 1.11
+++ TurbineLoggingService.java 2001/05/05 14:43:57 1.12
@@ -54,17 +54,17 @@
* <http://www.apache.org/>.
*/
-
-// Java Core Classes
-import java.util.*;
-import java.io.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-
-// Turbine Services Classes
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.resources.*;
-import org.apache.turbine.util.*;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.resources.ResourceService;
+import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.turbine.util.RunData;
/**
* The default implementation of the logging service in Turbine.
@@ -81,7 +81,7 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineLoggingService.java,v 1.11 2001/04/12 02:22:58 mpoeschl Exp $
+ * @version $Id: TurbineLoggingService.java,v 1.12 2001/05/05 14:43:57 jvanzyl Exp $
*/
public class TurbineLoggingService
extends TurbineBaseService
1.6 +5 -8 jakarta-turbine/src/java/org/apache/turbine/services/naming/NamingService.java
Index: NamingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/naming/NamingService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingService.java 2001/04/08 16:41:08 1.5
+++ NamingService.java 2001/05/05 14:43:58 1.6
@@ -54,21 +54,18 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import javax.naming.*;
+import javax.naming.Context;
+import org.apache.turbine.services.Service;
-// Turbine stuff.
-import org.apache.turbine.services.*;
-
/**
* Implementations of the NamingService interface provide JNDI naming
* contexts.
*
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
- * @version $Id: NamingService.java,v 1.5 2001/04/08 16:41:08 ilkka Exp $
+ * @version $Id: NamingService.java,v 1.6 2001/05/05 14:43:58 jvanzyl Exp $
*/
-public interface NamingService extends Service {
-
+public interface NamingService extends Service
+{
public static final String SERVICE_NAME = "NamingService";
/**
1.7 +13 -9 jakarta-turbine/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
Index: TurbineNamingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/naming/TurbineNamingService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineNamingService.java 2001/03/18 16:58:18 1.6
+++ TurbineNamingService.java 2001/05/05 14:43:58 1.7
@@ -54,21 +54,25 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.util.*;
-import javax.naming.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Properties;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import org.apache.turbine.services.BaseService;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
-// Turbine stuff.
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.resources.*;
-
/**
* This class is the default implementation of NamingService, which
* provides JNDI naming contexts.
*
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
- * @version $Id: TurbineNamingService.java,v 1.6 2001/03/18 16:58:18 jvanzyl Exp $
+ * @version $Id: TurbineNamingService.java,v 1.7 2001/05/05 14:43:58 jvanzyl Exp $
*/
public class TurbineNamingService
extends TurbineBaseService
1.11 +1 -4 jakarta-turbine/src/java/org/apache/turbine/services/resources/ResourceService.java
Index: ResourceService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/resources/ResourceService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResourceService.java 2001/03/25 23:02:57 1.10
+++ ResourceService.java 2001/05/05 14:43:58 1.11
@@ -57,11 +57,8 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
-
import javax.servlet.ServletConfig;
-
import org.apache.turbine.services.Service;
-
import org.apache.velocity.runtime.configuration.Configuration;
/**
@@ -86,7 +83,7 @@
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: ResourceService.java,v 1.10 2001/03/25 23:02:57 jvanzyl Exp $
+ * @version $Id: ResourceService.java,v 1.11 2001/05/05 14:43:58 jvanzyl Exp $
*/
public interface ResourceService extends Service
{
1.31 +8 -12 jakarta-turbine/src/java/org/apache/turbine/services/resources/TurbineResourceService.java
Index: TurbineResourceService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/resources/TurbineResourceService.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TurbineResourceService.java 2001/03/25 23:02:57 1.30
+++ TurbineResourceService.java 2001/05/05 14:43:58 1.31
@@ -54,24 +54,20 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
-// Turbine stuff.
-import org.apache.turbine.Turbine;
-//import org.apache.turbine.util.Configurations;
-//import org.apache.turbine.util.ExtendedProperties;
+import org.apache.turbine.services.BaseInitable;
+import org.apache.turbine.services.BaseServiceBroker;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.ServiceBroker;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.ServletUtils;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineException;
-
import org.apache.velocity.runtime.configuration.Configuration;
/**
@@ -95,7 +91,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com@">Jason van Zyl</a>
- * @version $Id: TurbineResourceService.java,v 1.30 2001/03/25 23:02:57 jvanzyl Exp $
+ * @version $Id: TurbineResourceService.java,v 1.31 2001/05/05 14:43:58 jvanzyl Exp $
*/
public class TurbineResourceService extends TurbineBaseService
implements ResourceService
1.22 +4 -6 jakarta-turbine/src/java/org/apache/turbine/services/resources/TurbineResources.java
Index: TurbineResources.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/resources/TurbineResources.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TurbineResources.java 2001/03/25 23:02:58 1.21
+++ TurbineResources.java 2001/05/05 14:43:58 1.22
@@ -54,12 +54,10 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-
+import java.util.Iterator;
+import java.util.Vector;
import javax.servlet.ServletConfig;
-
-import org.apache.turbine.services.*;
-
+import org.apache.turbine.services.TurbineServices;
import org.apache.velocity.runtime.configuration.Configuration;
/**
@@ -73,7 +71,7 @@
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TurbineResources.java,v 1.21 2001/03/25 23:02:58 jvanzyl Exp $
+ * @version $Id: TurbineResources.java,v 1.22 2001/05/05 14:43:58 jvanzyl Exp $
*/
public abstract class TurbineResources
{
1.10 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultTurbineRunData.java 2001/04/23 13:39:54 1.9
+++ DefaultTurbineRunData.java 2001/05/05 14:43:59 1.10
@@ -55,7 +55,6 @@
*/
// Java Core Classes
-//import java.sql.*;
import java.util.Locale;
import java.util.Vector;
import java.util.Hashtable;
@@ -109,7 +108,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:bhoeneis@ee.ethz.ch">Bernie Hoeneisen</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: DefaultTurbineRunData.java,v 1.9 2001/04/23 13:39:54 ilkka Exp $
+ * @version $Id: DefaultTurbineRunData.java,v 1.10 2001/05/05 14:43:59 jvanzyl Exp $
*/
public class DefaultTurbineRunData
extends RecyclableSupport
1.12 +6 -9 jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobEntry.java
Index: JobEntry.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobEntry.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JobEntry.java 2001/03/08 16:12:44 1.11
+++ JobEntry.java 2001/05/05 14:43:59 1.12
@@ -54,21 +54,18 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Hashtable;
+import org.apache.turbine.om.BaseObject;
+import org.apache.turbine.util.db.Criteria;
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.om.*;
-import org.apache.turbine.util.db.*;
-
/**
* This is a wrapper for a scheduled job. It is modeled after the
* Unix scheduler cron.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: JobEntry.java,v 1.11 2001/03/08 16:12:44 dlr Exp $
+ * @version $Id: JobEntry.java,v 1.12 2001/05/05 14:43:59 jvanzyl Exp $
*/
public class JobEntry extends BaseObject
{
1.11 +13 -13 jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java
Index: JobEntryPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JobEntryPeer.java 2001/03/08 16:19:28 1.10
+++ JobEntryPeer.java 2001/05/05 14:43:59 1.11
@@ -54,25 +54,25 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.*;
-
-import com.workingdogs.village.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.util.db.*;
+import com.workingdogs.village.Record;
+import com.workingdogs.village.Value;
+import java.util.Hashtable;
+import java.util.Vector;
+import org.apache.turbine.om.BaseObject;
+import org.apache.turbine.om.ObjectKey;
+import org.apache.turbine.om.peer.BasePeer;
+import org.apache.turbine.util.ObjectUtils;
+import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.util.db.map.DatabaseMap;
+import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.db.pool.DBConnection;
-import org.apache.turbine.om.*;
-import org.apache.turbine.om.peer.*;
-import org.apache.turbine.util.db.map.*;
/**
* Peer class for JobEntry database access.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: JobEntryPeer.java,v 1.10 2001/03/08 16:19:28 dlr Exp $
+ * @version $Id: JobEntryPeer.java,v 1.11 2001/05/05 14:43:59 jvanzyl Exp $
*/
public class JobEntryPeer extends BasePeer
{
1.6 +1 -7 jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobQueue.java
Index: JobQueue.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/JobQueue.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JobQueue.java 2001/03/08 02:45:45 1.5
+++ JobQueue.java 2001/05/05 14:43:59 1.6
@@ -54,22 +54,16 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
import java.util.List;
import java.util.Vector;
-
-// Turbine Stuff
import org.apache.turbine.util.Comparable;
import org.apache.turbine.util.QuickSort;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.db.*;
/**
* Queue for the scheduler.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: JobQueue.java,v 1.5 2001/03/08 02:45:45 dbryson Exp $
+ * @version $Id: JobQueue.java,v 1.6 2001/05/05 14:43:59 jvanzyl Exp $
*/
public class JobQueue
implements Comparable
1.6 +2 -6 jakarta-turbine/src/java/org/apache/turbine/services/schedule/ScheduleService.java
Index: ScheduleService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/ScheduleService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScheduleService.java 2001/04/08 16:41:09 1.5
+++ ScheduleService.java 2001/05/05 14:43:59 1.6
@@ -54,18 +54,14 @@
* <http://www.apache.org/>.
*/
-// Java Stuff
-import java.util.*;
-
-// Turbine Stuff
+import java.util.Vector;
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.*;
/**
* ScheduleService interface.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: ScheduleService.java,v 1.5 2001/04/08 16:41:09 ilkka Exp $
+ * @version $Id: ScheduleService.java,v 1.6 2001/05/05 14:43:59 jvanzyl Exp $
*/
public interface ScheduleService
extends Service
1.6 +3 -13 jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineNonPersistentSchedulerService.java 2001/03/06 06:12:44 1.5
+++ TurbineNonPersistentSchedulerService.java 2001/05/05 14:43:59 1.6
@@ -54,21 +54,11 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.Date;
+import java.util.List;
import java.util.Vector;
-
-// Turbine Stuff
-import org.apache.turbine.modules.*;
-import org.apache.turbine.services.*;
+import javax.servlet.ServletConfig;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.*;
-
-// Java Servlet Classes
-import javax.servlet.*;
-import javax.servlet.http.*;
-
+import org.apache.turbine.util.Log;
/**
* Service for a cron like scheduler that uses the
1.16 +8 -16 jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java
Index: TurbineSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineSchedulerService.java 2001/03/06 06:12:44 1.15
+++ TurbineSchedulerService.java 2001/05/05 14:43:59 1.16
@@ -54,28 +54,20 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.Date;
+import java.util.List;
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.db.Criteria;
-// Turbine Stuff
-import org.apache.turbine.modules.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.util.db.*;
-import org.apache.turbine.services.resources.*;
-
-// Java Servlet Classes
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-
/**
* Service for a cron like scheduler.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TurbineSchedulerService.java,v 1.15 2001/03/06 06:12:44 chrise Exp $
+ * @version $Id: TurbineSchedulerService.java,v 1.16 2001/05/05 14:43:59 jvanzyl Exp $
*/
public class TurbineSchedulerService
extends TurbineBaseService
1.19 +4 -14 jakarta-turbine/src/java/org/apache/turbine/services/schedule/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/WorkerThread.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WorkerThread.java 2001/04/04 22:52:23 1.18
+++ WorkerThread.java 2001/05/05 14:43:59 1.19
@@ -54,27 +54,17 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.Date;
-import java.util.Vector;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-
-// Turbine loaders
-import org.apache.turbine.modules.*;
-
-// Turbine logging
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.services.logging.*;
+import org.apache.turbine.modules.ScheduledJobLoader;
+import org.apache.turbine.services.logging.Logger;
+import org.apache.turbine.services.logging.TurbineLogging;
/**
* Wrapper for a <code>JobEntry</code> to actually perform the job's action.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: WorkerThread.java,v 1.18 2001/04/04 22:52:23 dlr Exp $
+ * @version $Id: WorkerThread.java,v 1.19 2001/05/05 14:43:59 jvanzyl Exp $
*/
public class WorkerThread
implements Runnable
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org