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:03:46 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/webmacro TurbineTemplateProvider.java TurbineWebMacro.java TurbineWebMacroService.java WebMacroService.java
jvanzyl 01/05/05 07:03:46
Modified: src/java/org/apache/turbine/services/security/db
DBSecurityService.java
src/java/org/apache/turbine/services/security/ldap
LDAPUser.java
src/java/org/apache/turbine/services/uniqueid
TurbineUniqueId.java TurbineUniqueIdService.java
src/java/org/apache/turbine/services/upload
FileHandlerUploadService.java
OReillyUploadService.java TurbineUpload.java
TurbineUploadService.java UploadService.java
src/java/org/apache/turbine/services/velocity
VelocityService.java
src/java/org/apache/turbine/services/webmacro
TurbineTemplateProvider.java TurbineWebMacro.java
TurbineWebMacroService.java WebMacroService.java
Log:
- qualifying imports
Revision Changes Path
1.5 +31 -13 jakarta-turbine/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/db/DBSecurityService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DBSecurityService.java 2001/04/17 22:51:34 1.4
+++ DBSecurityService.java 2001/05/05 14:03:43 1.5
@@ -54,31 +54,49 @@
* <http://www.apache.org/>.
*/
+import java.util.Collection;
import java.util.Hashtable;
-import java.util.Vector;
import java.util.Iterator;
-import java.util.Collection;
-
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Vector;
import org.apache.turbine.om.BaseObject;
-
-import org.apache.turbine.om.security.*;
-import org.apache.turbine.om.security.peer.*;
-import org.apache.turbine.util.security.*;
-
-import org.apache.turbine.services.Service;
-import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.om.ObjectKey;
+import org.apache.turbine.om.peer.BasePeer;
+import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Permission;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.SecurityEntity;
+import org.apache.turbine.om.security.SecurityObject;
+import org.apache.turbine.om.security.TurbineGroup;
+import org.apache.turbine.om.security.TurbinePermission;
+import org.apache.turbine.om.security.TurbineRole;
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.om.security.peer.GroupPeer;
+import org.apache.turbine.om.security.peer.PermissionPeer;
+import org.apache.turbine.om.security.peer.RolePeer;
+import org.apache.turbine.om.security.peer.RolePermissionPeer;
+import org.apache.turbine.om.security.peer.UserGroupRolePeer;
+import org.apache.turbine.om.security.peer.UserPeer;
+import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.security.BaseSecurityService;
import org.apache.turbine.services.security.TurbineSecurity;
-
-import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.util.security.AccessControlList;
+import org.apache.turbine.util.security.DataBackendException;
+import org.apache.turbine.util.security.EntityExistsException;
+import org.apache.turbine.util.security.GroupSet;
+import org.apache.turbine.util.security.PermissionSet;
+import org.apache.turbine.util.security.RoleSet;
+import org.apache.turbine.util.security.UnknownEntityException;
/**
* An implementation of SecurityService that uses a database as backend.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: DBSecurityService.java,v 1.4 2001/04/17 22:51:34 jvanzyl Exp $
+ * @version $Id: DBSecurityService.java,v 1.5 2001/05/05 14:03:43 jvanzyl Exp $
*/
public class DBSecurityService extends BaseSecurityService
{
1.7 +8 -10 jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
Index: LDAPUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LDAPUser.java 2001/04/20 22:11:57 1.6
+++ LDAPUser.java 2001/05/05 14:03:44 1.7
@@ -54,19 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import java.sql.*;
-import java.io.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Hashtable;
+import javax.servlet.http.HttpSessionBindingEvent;
import org.apache.turbine.om.BaseObject;
-import org.apache.turbine.services.security.SecurityService;
+import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.Log;
-import org.apache.turbine.om.security.*;
/**
* LDAPUser implements User and provides access to a user who accesses the
1.6 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueId.java
Index: TurbineUniqueId.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueId.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineUniqueId.java 2001/03/06 06:12:52 1.5
+++ TurbineUniqueId.java 2001/05/05 14:03:44 1.6
@@ -54,14 +54,13 @@
* <http://www.apache.org/>.
*/
-// Turbine stuff.
import org.apache.turbine.services.TurbineServices;
/**
* This is a facade class for {@link UniqueIdService}.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineUniqueId.java,v 1.5 2001/03/06 06:12:52 chrise Exp $
+ * @version $Id: TurbineUniqueId.java,v 1.6 2001/05/05 14:03:44 jvanzyl Exp $
*/
public abstract class TurbineUniqueId
{
1.9 +1 -4 jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
Index: TurbineUniqueIdService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineUniqueIdService.java 2001/03/06 06:12:52 1.8
+++ TurbineUniqueIdService.java 2001/05/05 14:03:44 1.9
@@ -54,13 +54,10 @@
* <http://www.apache.org/>.
*/
-// Turbine stuff.
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.GenerateUniqueId;
import org.apache.turbine.services.TurbineBaseService;
-
-// Apache Java stuff.
import org.apache.java.security.MD5;
import org.apache.java.lang.Bytes;
@@ -68,7 +65,7 @@
* <p> This is an implementation of {@link UniqueIdService}.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineUniqueIdService.java,v 1.8 2001/03/06 06:12:52 chrise Exp $
+ * @version $Id: TurbineUniqueIdService.java,v 1.9 2001/05/05 14:03:44 jvanzyl Exp $
*/
public class TurbineUniqueIdService
extends TurbineBaseService
1.5 +6 -9 jakarta-turbine/src/java/org/apache/turbine/services/upload/FileHandlerUploadService.java
Index: FileHandlerUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/FileHandlerUploadService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileHandlerUploadService.java 2001/03/06 06:12:53 1.4
+++ FileHandlerUploadService.java 2001/05/05 14:03:45 1.5
@@ -54,15 +54,12 @@
* <http://www.apache.org/>.
*/
-// Java stuff.
-import java.io.*;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.util.upload.FileHandler;
-// Turbine stuff.
-import org.apache.turbine.util.*;
-import org.apache.turbine.util.upload.*;
-import org.apache.turbine.services.*;
-
/**
* <p> This is an implementation of {@link UploadService} that uses
* {@link org.apache.turbine.util.upload.FileHandler} to to parse
@@ -72,7 +69,7 @@
* {@link TurbineUploadService} in new applications.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: FileHandlerUploadService.java,v 1.4 2001/03/06 06:12:53 chrise Exp $
+ * @version $Id: FileHandlerUploadService.java,v 1.5 2001/05/05 14:03:45 jvanzyl Exp $
*/
public class FileHandlerUploadService
extends TurbineBaseService
1.6 +10 -15 jakarta-turbine/src/java/org/apache/turbine/services/upload/OReillyUploadService.java
Index: OReillyUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/OReillyUploadService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OReillyUploadService.java 2001/03/06 06:12:54 1.5
+++ OReillyUploadService.java 2001/05/05 14:03:45 1.6
@@ -54,21 +54,16 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Enumeration;
+import java.util.Vector;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.util.ValueParser;
-// Java Servlet Classes
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-// Turbine classes
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.*;
-
/**
* <p> This is an implementation of the {@link UploadService} using
* the O'Reilly multipart request parser from the book Java Servlet
@@ -78,7 +73,7 @@
* {@link TurbineUploadService} in new applications.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: OReillyUploadService.java,v 1.5 2001/03/06 06:12:54 chrise Exp $
+ * @version $Id: OReillyUploadService.java,v 1.6 2001/05/05 14:03:45 jvanzyl Exp $
*/
public class OReillyUploadService
extends TurbineBaseService
1.10 +9 -9 jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java
Index: TurbineUpload.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineUpload.java 2001/03/06 06:12:54 1.9
+++ TurbineUpload.java 2001/05/05 14:03:45 1.10
@@ -54,15 +54,15 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.*;
-import javax.servlet.http.*;
+import java.util.Properties;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.turbine.services.InstantiationException;
+import org.apache.turbine.services.Service;
+import org.apache.turbine.services.ServiceBroker;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.TurbineException;
-// Turbine stuff.
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-
/**
* <p> This is a facade class for {@link UploadService}.
*
@@ -73,7 +73,7 @@
* the service's properties and default values for them.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineUpload.java,v 1.9 2001/03/06 06:12:54 chrise Exp $
+ * @version $Id: TurbineUpload.java,v 1.10 2001/05/05 14:03:45 jvanzyl Exp $
*/
public abstract class TurbineUpload
{
1.14 +18 -12 jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Index: TurbineUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineUploadService.java 2001/04/11 00:45:53 1.13
+++ TurbineUploadService.java 2001/05/05 14:03:45 1.14
@@ -54,18 +54,24 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Properties;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.turbine.services.BaseService;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.util.ValueParser;
+import org.apache.turbine.util.upload.FileItem;
+import org.apache.turbine.util.upload.MultipartStream;
-// Turbine stuff.
-import org.apache.turbine.util.*;
-import org.apache.turbine.util.upload.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.resources.*;
-
/**
* <p> This class is an implementation of {@link UploadService}.
*
@@ -83,7 +89,7 @@
* html widget.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineUploadService.java,v 1.13 2001/04/11 00:45:53 jon Exp $
+ * @version $Id: TurbineUploadService.java,v 1.14 2001/05/05 14:03:45 jvanzyl Exp $
*/
public class TurbineUploadService
extends TurbineBaseService
1.7 +5 -8 jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java
Index: UploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UploadService.java 2001/04/08 16:41:11 1.6
+++ UploadService.java 2001/05/05 14:03:45 1.7
@@ -54,14 +54,11 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.io.*;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.turbine.services.Service;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.TurbineException;
-// Turbine stuff.
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-
/**
* <p> This service handles parsing <code>multipart/form-data</code>
* POST requests and turing them into form fields and uploaded files.
@@ -70,7 +67,7 @@
* definded {@link org.apache.turbine.modules.Action}.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: UploadService.java,v 1.6 2001/04/08 16:41:11 ilkka Exp $
+ * @version $Id: UploadService.java,v 1.7 2001/05/05 14:03:45 jvanzyl Exp $
*/
public interface UploadService
extends Service
1.13 +4 -9 jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java
Index: VelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VelocityService.java 2001/04/08 16:41:11 1.12
+++ VelocityService.java 2001/05/05 14:03:45 1.13
@@ -54,17 +54,12 @@
* <http://www.apache.org/>.
*/
-// JDK Stuff
-import java.io.*;
-
-// Turbine Stuff
+import java.io.OutputStream;
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.*;
-
-// Velocity Stuff
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.TurbineException;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.velocity.io.*;
/**
* Implementations of the VelocityService interface.
@@ -72,7 +67,7 @@
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: VelocityService.java,v 1.12 2001/04/08 16:41:11 ilkka Exp $
+ * @version $Id: VelocityService.java,v 1.13 2001/05/05 14:03:45 jvanzyl Exp $
*/
public interface VelocityService extends Service
{
1.11 +16 -15 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineTemplateProvider.java
Index: TurbineTemplateProvider.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineTemplateProvider.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineTemplateProvider.java 2001/03/31 15:58:28 1.10
+++ TurbineTemplateProvider.java 2001/05/05 14:03:46 1.11
@@ -54,22 +54,23 @@
* <http://www.apache.org/>.
*/
-// Java Core Classes
-import java.util.*;
-import java.io.*;
-
-// WebMacro stuff.
-import org.webmacro.broker.*;
-import org.webmacro.*;
-import org.webmacro.engine.FileTemplate;
-
-// Turbine stuff.
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.StringUtils;
-import org.apache.turbine.services.*;
+import java.io.File;
+import org.apache.turbine.services.ServiceBroker;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.template.TurbineTemplate;
-
+import org.apache.turbine.util.Log;
import org.apache.velocity.runtime.configuration.Configuration;
+import org.webmacro.Broker;
+import org.webmacro.NotFoundException;
+import org.webmacro.Template;
+import org.webmacro.broker.Config;
+import org.webmacro.broker.CreateResourceEvent;
+import org.webmacro.broker.RequestResourceEvent;
+import org.webmacro.broker.ResourceBroker;
+import org.webmacro.broker.ResourceEvent;
+import org.webmacro.broker.ResourceInitException;
+import org.webmacro.broker.ResourceProvider;
+import org.webmacro.engine.FileTemplate;
/**
* <p>This class provides the WebMacro engine with <code>Temlate</code>
@@ -81,7 +82,7 @@
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: TurbineTemplateProvider.java,v 1.10 2001/03/31 15:58:28 jvanzyl Exp $
+ * @version $Id: TurbineTemplateProvider.java,v 1.11 2001/05/05 14:03:46 jvanzyl Exp $
*/
public class TurbineTemplateProvider
implements ResourceProvider
1.13 +7 -13 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacro.java
Index: TurbineWebMacro.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacro.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TurbineWebMacro.java 2001/04/03 01:24:35 1.12
+++ TurbineWebMacro.java 2001/05/05 14:03:46 1.13
@@ -54,19 +54,13 @@
* <http://www.apache.org/>.
*/
-// Java Stuff
-import java.util.*;
-import java.io.*;
+import java.io.OutputStream;
+import org.apache.turbine.services.Service;
+import org.apache.turbine.services.ServiceBroker;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.util.RunData;
+import org.webmacro.servlet.WebContext;
-// WebMacro Stuff
-import org.webmacro.*;
-import org.webmacro.util.*;
-import org.webmacro.servlet.*;
-
-// Turbine Stuff
-import org.apache.turbine.services.*;
-import org.apache.turbine.util.*;
-
/**
* This is a simple static accessor to common WebMacro tasks such as
* getting an instance of a context as well as handling a request for
@@ -80,7 +74,7 @@
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineWebMacro.java,v 1.12 2001/04/03 01:24:35 dlr Exp $
+ * @version $Id: TurbineWebMacro.java,v 1.13 2001/05/05 14:03:46 jvanzyl Exp $
*/
public abstract class TurbineWebMacro
{
1.37 +21 -22 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java
Index: TurbineWebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TurbineWebMacroService.java 2001/04/10 21:31:56 1.36
+++ TurbineWebMacroService.java 2001/05/05 14:03:46 1.37
@@ -57,36 +57,35 @@
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import javax.servlet.ServletConfig;
-
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.turbine.services.BaseInitable;
+import org.apache.turbine.services.BaseService;
+import org.apache.turbine.services.InitializationException;
+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.ContentURI;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.util.template.TemplateLink;
+import org.apache.turbine.util.template.TemplatePageAttributes;
+import org.apache.turbine.util.webmacro.WebMacroFormatter;
+import org.apache.velocity.runtime.configuration.Configuration;
import org.webmacro.Broker;
+import org.webmacro.Context;
import org.webmacro.FastWriter;
import org.webmacro.InitException;
+import org.webmacro.Macro;
import org.webmacro.NotFoundException;
import org.webmacro.Template;
-import org.webmacro.WebMacro;
import org.webmacro.WM;
-import org.webmacro.broker.Config;
+import org.webmacro.WebMacro;
import org.webmacro.broker.ResourceBroker;
-import org.webmacro.broker.ResourceMap;
import org.webmacro.broker.ResourceProvider;
import org.webmacro.servlet.WebContext;
-
-import org.apache.turbine.util.ContentURI;
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.StringUtils;
-import org.apache.turbine.util.TurbineException;
-
-import org.apache.turbine.util.template.TemplateLink;
-import org.apache.turbine.util.template.TemplatePageAttributes;
-import org.apache.turbine.util.webmacro.WebMacroFormatter;
-
-import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.servlet.TurbineServlet;
-import org.apache.turbine.services.template.BaseTemplateEngineService;
-import org.apache.turbine.services.template.TurbineTemplate;
-
-import org.apache.velocity.runtime.configuration.Configuration;
+import org.webmacro.util.ThreadScheduler;
/**
* This is a Service that can process WebMacro templates from within a
@@ -114,7 +113,7 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: TurbineWebMacroService.java,v 1.36 2001/04/10 21:31:56 dlr Exp $
+ * @version $Id: TurbineWebMacroService.java,v 1.37 2001/05/05 14:03:46 jvanzyl Exp $
*/
public class TurbineWebMacroService extends BaseTemplateEngineService
implements WebMacroService
1.15 +8 -11 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/WebMacroService.java
Index: WebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/WebMacroService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebMacroService.java 2001/04/08 16:41:10 1.14
+++ WebMacroService.java 2001/05/05 14:03:46 1.15
@@ -54,24 +54,21 @@
* <http://www.apache.org/>.
*/
-// JDK Stuff
-import java.io.*;
-
-// Turbine Stuff
+import java.io.OutputStream;
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.*;
-
-// WebMacro Stuff
-import org.webmacro.*;
-import org.webmacro.util.*;
-import org.webmacro.servlet.*;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.TurbineException;
+import org.webmacro.FastWriter;
+import org.webmacro.NotFoundException;
+import org.webmacro.Template;
+import org.webmacro.servlet.WebContext;
/**
* Implementations of the WebMacroService interface.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: WebMacroService.java,v 1.14 2001/04/08 16:41:10 ilkka Exp $
+ * @version $Id: WebMacroService.java,v 1.15 2001/05/05 14:03:46 jvanzyl Exp $
*/
public interface WebMacroService
extends Service
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org