jvanzyl 01/08/01 08:36:03
Modified: src/java/org/apache/turbine/services/velocity
ContextAdapter.java TurbineVelocity.java
TurbineVelocityService.java VelocityService.java
Log:
- reflect changes in services
Revision Changes Path
1.6 +1 -2
jakarta-turbine/src/java/org/apache/turbine/services/velocity/ContextAdapter.java
Index: ContextAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/ContextAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextAdapter.java 2001/07/24 02:51:27 1.5
+++ ContextAdapter.java 2001/08/01 15:36:02 1.6
@@ -55,12 +55,11 @@
*/
import org.apache.turbine.services.template.TemplateContext;
-
import org.apache.velocity.context.Context;
/**
* An adapter for Turbine's {@link
- * org.apache.turbine.services.template.TemplateContext} which extends
+ * org.apache.fulcrum.template.TemplateContext} which extends
* Velocity's Context interface. Allows for easy processing of
* TemplateContext objects by Velocity.
*
1.20 +2 -5
jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocity.java
Index: TurbineVelocity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocity.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurbineVelocity.java 2001/07/20 21:32:49 1.19
+++ TurbineVelocity.java 2001/08/01 15:36:02 1.20
@@ -55,10 +55,7 @@
*/
import java.io.OutputStream;
-
-import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.velocity.VelocityService;
-
+import org.apache.fulcrum.TurbineServices;
import org.apache.velocity.context.Context;
/**
@@ -75,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TurbineVelocity.java,v 1.19 2001/07/20 21:32:49 jon Exp $
+ * @version $Id: TurbineVelocity.java,v 1.20 2001/08/01 15:36:02 jvanzyl Exp $
*/
public abstract class TurbineVelocity
{
1.60 +9 -9
jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- TurbineVelocityService.java 2001/07/24 18:53:56 1.59
+++ TurbineVelocityService.java 2001/08/01 15:36:03 1.60
@@ -65,8 +65,8 @@
import org.apache.velocity.app.Velocity;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.InitializationException;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.InitializationException;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.services.template.TemplateContext;
import org.apache.turbine.services.template.BaseTemplateEngineService;
@@ -92,7 +92,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineVelocityService.java,v 1.59 2001/07/24 18:53:56 dlr Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.60 2001/08/01 15:36:03 jvanzyl Exp
$
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
@@ -132,7 +132,7 @@
}
/**
- * @see org.apache.turbine.services.velocity.VelocityService
+ * @see org.apache.fulcrum.velocity.VelocityService
*/
public String handleRequest(TemplateContext context, String template)
throws ServiceException
@@ -141,7 +141,7 @@
}
/**
- * @see org.apache.turbine.services.velocity.VelocityService
+ * @see org.apache.fulcrum.velocity.VelocityService
*/
public String handleRequest(Context context, String filename)
throws ServiceException
@@ -150,7 +150,7 @@
}
/**
- * @see org.apache.turbine.services.velocity.VelocityService
+ * @see org.apache.fulcrum.velocity.VelocityService
*/
public String handleRequest(Context context, String filename,
String charset, String encoding)
@@ -187,7 +187,7 @@
}
/**
- * @see org.apache.turbine.services.template.TemplateEngineService
+ * @see org.apache.fulcrum.template.TemplateEngineService
*/
public void handleRequest(TemplateContext context, String template,
OutputStream outputStream)
@@ -197,7 +197,7 @@
}
/**
- * @see org.apache.turbine.services.velocity.VelocityService
+ * @see org.apache.fulcrum.velocity.VelocityService
*/
public void handleRequest(Context context, String filename,
OutputStream output)
@@ -207,7 +207,7 @@
}
/**
- * @see org.apache.turbine.services.velocity.VelocityService
+ * @see org.apache.fulcrum.velocity.VelocityService
*/
public void handleRequest(Context context, String filename,
OutputStream output, String charset,
1.22 +3 -3
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VelocityService.java 2001/07/24 03:01:13 1.21
+++ VelocityService.java 2001/08/01 15:36:03 1.22
@@ -55,8 +55,8 @@
*/
import java.io.OutputStream;
-import org.apache.turbine.services.Service;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.Service;
+import org.apache.fulcrum.ServiceException;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
@@ -68,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: VelocityService.java,v 1.21 2001/07/24 03:01:13 dlr Exp $
+ * @version $Id: VelocityService.java,v 1.22 2001/08/01 15:36:03 jvanzyl Exp $
*/
public interface VelocityService extends Service
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
