jmcnally 01/12/03 19:16:41
Modified: src/services/java/org/apache/fulcrum/jsp
TurbineJspService.java
src/services/java/org/apache/fulcrum/template
BaseTemplateEngineService.java
TemplateEngineService.java TemplateService.java
TurbineTemplate.java TurbineTemplateService.java
src/services/java/org/apache/fulcrum/velocity
TurbineVelocity.java TurbineVelocityService.java
VelocityService.java
Log:
added methods that take a writer to the template related services.
Revision Changes Path
1.3 +12 -0
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/jsp/TurbineJspService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineJspService.java 2001/09/03 15:08:02 1.2
+++ TurbineJspService.java 2001/12/04 03:16:40 1.3
@@ -57,6 +57,7 @@
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.Writer;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.RequestDispatcher;
@@ -230,6 +231,17 @@
*/
public void handleRequest(TemplateContext context, String template,
OutputStream outputStream)
+ throws ServiceException
+ {
+ // TODO: Implement me!
+ }
+
+ /**
+ * @see org.apache.fulcrum.template.TemplateEngineService#handleRequest(
+ * Context, String, Writer)
+ */
+ public void handleRequest(TemplateContext context,
+ String template, Writer writer)
throws ServiceException
{
// TODO: Implement me!
1.3 +9 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/BaseTemplateEngineService.java
Index: BaseTemplateEngineService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/BaseTemplateEngineService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseTemplateEngineService.java 2001/08/10 11:46:24 1.2
+++ BaseTemplateEngineService.java 2001/12/04 03:16:40 1.3
@@ -55,6 +55,7 @@
*/
import java.io.OutputStream;
+import java.io.Writer;
import java.util.Iterator;
import java.util.Hashtable;
import org.apache.fulcrum.BaseService;
@@ -66,7 +67,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: BaseTemplateEngineService.java,v 1.2 2001/08/10 11:46:24 knielsen
Exp $
+ * @version $Id: BaseTemplateEngineService.java,v 1.3 2001/12/04 03:16:40 jmcnally
Exp $
*/
public abstract class BaseTemplateEngineService
extends BaseService
@@ -159,5 +160,12 @@
public abstract void handleRequest(TemplateContext context,
String template, OutputStream os)
+ throws ServiceException;
+
+ /**
+ * @see org.apache.fulcrum.template.TemplateEngineService
+ */
+ public abstract void handleRequest(TemplateContext context,
+ String template, Writer writer)
throws ServiceException;
}
1.3 +8 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TemplateEngineService.java
Index: TemplateEngineService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TemplateEngineService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateEngineService.java 2001/08/10 11:46:24 1.2
+++ TemplateEngineService.java 2001/12/04 03:16:40 1.3
@@ -55,6 +55,7 @@
*/
import java.io.OutputStream;
+import java.io.Writer;
import java.util.Hashtable;
import org.apache.fulcrum.ServiceException;
@@ -65,7 +66,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TemplateEngineService.java,v 1.2 2001/08/10 11:46:24 knielsen Exp
$ */
+ * @version $Id: TemplateEngineService.java,v 1.3 2001/12/04 03:16:40 jmcnally Exp
$ */
public interface TemplateEngineService
{
public static final String TEMPLATE_EXTENSIONS = "template.extension";
@@ -122,5 +123,11 @@
public abstract void handleRequest(TemplateContext context,
String template,
OutputStream outputStream)
+ throws ServiceException;
+
+ /**
+ * @see org.apache.fulcrum.template.TemplateEngineService
+ */
+ void handleRequest(TemplateContext context, String template, Writer writer)
throws ServiceException;
}
1.4 +6 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TemplateService.java
Index: TemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TemplateService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateService.java 2001/09/07 21:46:03 1.3
+++ TemplateService.java 2001/12/04 03:16:40 1.4
@@ -55,6 +55,7 @@
*/
import java.io.OutputStream;
+import java.io.Writer;
import org.apache.fulcrum.Service;
import org.apache.fulcrum.ServiceException;
@@ -69,7 +70,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TemplateService.java,v 1.3 2001/09/07 21:46:03 dlr Exp $
+ * @version $Id: TemplateService.java,v 1.4 2001/12/04 03:16:40 jmcnally Exp $
*/
public interface TemplateService
extends Service
@@ -117,6 +118,10 @@
public void handleRequest(TemplateContext context, String template,
OutputStream outputStream)
+ throws ServiceException;
+
+ public void handleRequest(TemplateContext context, String template,
+ Writer writer)
throws ServiceException;
public TemplateContext getTemplateContext();
1.3 +10 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TurbineTemplate.java
Index: TurbineTemplate.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TurbineTemplate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineTemplate.java 2001/08/10 11:46:24 1.2
+++ TurbineTemplate.java 2001/12/04 03:16:40 1.3
@@ -55,6 +55,7 @@
*/
import java.io.OutputStream;
+import java.io.Writer;
import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.TurbineServices;
@@ -63,7 +64,7 @@
* getting a Screen that is associated with a screen template.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: TurbineTemplate.java,v 1.2 2001/08/10 11:46:24 knielsen Exp $
+ * @version $Id: TurbineTemplate.java,v 1.3 2001/12/04 03:16:40 jmcnally Exp $
*/
public abstract class TurbineTemplate
{
@@ -106,6 +107,14 @@
throws ServiceException
{
getService().handleRequest(context, template, outputStream);
+ }
+
+ public static final void handleRequest(TemplateContext context,
+ String template,
+ Writer writer)
+ throws ServiceException
+ {
+ getService().handleRequest(context, template, writer);
}
public static final TemplateContext getTemplateContext()
1.4 +10 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/template/TurbineTemplateService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineTemplateService.java 2001/09/07 22:15:04 1.3
+++ TurbineTemplateService.java 2001/12/04 03:16:40 1.4
@@ -56,6 +56,7 @@
import java.io.File;
import java.io.OutputStream;
+import java.io.Writer;
import java.util.HashMap;
import java.util.Hashtable;
import org.apache.fulcrum.ServiceException;
@@ -100,7 +101,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TurbineTemplateService.java,v 1.3 2001/09/07 22:15:04 dlr Exp $
+ * @version $Id: TurbineTemplateService.java,v 1.4 2001/12/04 03:16:40 jmcnally Exp
$
*/
public class TurbineTemplateService
extends BaseService
@@ -251,6 +252,14 @@
{
TemplateEngineService tes = getTemplateEngineService(template);
tes.handleRequest(context, template, outputStream);
+ }
+
+ public void handleRequest(TemplateContext context, String template,
+ Writer writer)
+ throws ServiceException
+ {
+ TemplateEngineService tes = getTemplateEngineService(template);
+ tes.handleRequest(context, template, writer);
}
public TemplateContext getTemplateContext()
1.5 +25 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocity.java
Index: TurbineVelocity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocity.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineVelocity.java 2001/10/04 17:39:39 1.4
+++ TurbineVelocity.java 2001/12/04 03:16:40 1.5
@@ -55,7 +55,9 @@
*/
import java.io.OutputStream;
+import java.io.Writer;
import org.apache.fulcrum.TurbineServices;
+import org.apache.fulcrum.ServiceException;
import org.apache.velocity.context.Context;
/**
@@ -73,7 +75,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Michael Stack</a>
- * @version $Id: TurbineVelocity.java,v 1.4 2001/10/04 17:39:39 dlr Exp $
+ * @version $Id: TurbineVelocity.java,v 1.5 2001/12/04 03:16:40 jmcnally Exp $
*/
public abstract class TurbineVelocity
{
@@ -161,5 +163,27 @@
throws Exception
{
getService().handleRequest(context, template, out, charset, encoding);
+ }
+
+ /**
+ * @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
+ * String, Writer)
+ */
+ public static void handleRequest(Context context, String filename,
+ Writer writer)
+ throws ServiceException
+ {
+ getService().handleRequest(context, filename, writer, null);
+ }
+
+ /**
+ * @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
+ * String, Writer, String)
+ */
+ public static void handleRequest(Context context, String filename,
+ Writer writer, String encoding)
+ throws ServiceException
+ {
+ getService().handleRequest(context, filename, writer, encoding);
}
}
1.10 +62 -9
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocityService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineVelocityService.java 2001/11/29 00:43:15 1.9
+++ TurbineVelocityService.java 2001/12/04 03:16:40 1.10
@@ -59,6 +59,7 @@
import java.util.Enumeration;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.Writer;
import java.io.OutputStreamWriter;
import java.io.ByteArrayOutputStream;
import org.apache.velocity.Template;
@@ -97,7 +98,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: TurbineVelocityService.java,v 1.9 2001/11/29 00:43:15 jon Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.10 2001/12/04 03:16:40 jmcnally
Exp $
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
@@ -167,7 +168,7 @@
public String handleRequest(Context context, String filename)
throws ServiceException
{
- return handleRequest(context, filename, null, null);
+ return handleRequest(context, filename, (String)null, null);
}
/**
@@ -239,6 +240,54 @@
}
/**
+ * @see org.apache.fulcrum.template.TemplateEngineService#handleRequest(
+ * Context, String, Writer)
+ */
+ public void handleRequest(TemplateContext context,
+ String template, Writer writer)
+ throws ServiceException
+ {
+ handleRequest(new ContextAdapter(context), template, writer);
+ }
+
+ /**
+ * @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
+ * String, Writer)
+ */
+ public void handleRequest(Context context, String filename,
+ Writer writer)
+ throws ServiceException
+ {
+ handleRequest(context, filename, writer, null);
+ }
+
+ /**
+ * @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
+ * String, Writer, String)
+ */
+ public void handleRequest(Context context, String filename,
+ Writer writer, String encoding)
+ throws ServiceException
+ {
+ try
+ {
+ if (encoding != null)
+ {
+ // Request scoped encoding first supported by Velocity 1.1.
+ Velocity.mergeTemplate(filename, encoding, context, writer);
+ }
+ else
+ {
+ Velocity.mergeTemplate(filename, context, writer);
+ }
+ }
+ catch (Exception e)
+ {
+ renderingError(filename, e);
+ }
+ }
+
+ /**
* Returns the populated event cartridge
*/
public EventCartridge getEventCartridge()
@@ -287,20 +336,24 @@
OutputStreamWriter writer = null;
try
{
- writer = new OutputStreamWriter(output, charset);
- if (encoding != null)
+ try
{
+<<<<<<< TurbineVelocityService.java
+ writer = new OutputStreamWriter(output, charset);
+=======
// Request scoped encoding first supported by Velocity 1.1.
Velocity.mergeTemplate(filename, encoding, vc, writer);
+>>>>>>> 1.9
}
- else
+ catch (Exception e)
{
+<<<<<<< TurbineVelocityService.java
+ renderingError(filename, e);
+=======
Velocity.mergeTemplate(filename, vc, writer);
+>>>>>>> 1.9
}
- }
- catch (Exception e)
- {
- renderingError(filename, e);
+ handleRequest(context, filename, writer, encoding);
}
finally
{
1.4 +34 -1
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/VelocityService.java
Index: VelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/VelocityService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocityService.java 2001/10/02 20:09:06 1.3
+++ VelocityService.java 2001/12/04 03:16:40 1.4
@@ -55,6 +55,7 @@
*/
import java.io.OutputStream;
+import java.io.Writer;
import org.apache.fulcrum.Service;
import org.apache.fulcrum.ServiceException;
import org.apache.velocity.Template;
@@ -68,7 +69,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.3 2001/10/02 20:09:06 dlr Exp $
+ * @version $Id: VelocityService.java,v 1.4 2001/12/04 03:16:40 jmcnally Exp $
*/
public interface VelocityService extends Service
{
@@ -138,5 +139,37 @@
public void handleRequest(Context context, String filename,
OutputStream out, String charset,
String encoding)
+ throws ServiceException;
+
+ /**
+ * Process the request and fill in the template using the values
+ * set in <code>context</code>.
+ *
+ * @param context A context to use when evaluating the specified
+ * template.
+ * @param filename The file name of the template.
+ * @param writer The writer to which we will write the processed template.
+ * @throws ServiceException Any exception trown while processing will be
+ * wrapped into a ServiceException and rethrown.
+ */
+ public void handleRequest(Context context, String filename,
+ Writer writer)
+ throws ServiceException;
+
+ /**
+ * Process the request and fill in the template using the values
+ * set in <code>context</code>.
+ *
+ * @param context A context to use when evaluating the specified
+ * template.
+ * @param filename The file name of the template.
+ * @param writer The writer to which we will write the processed template.
+ * @param encoding The encoding to use when merging context and
+ * template.
+ * @throws ServiceException Any exception trown while processing will be
+ * wrapped into a ServiceException and rethrown.
+ */
+ public void handleRequest(Context context, String filename,
+ Writer writer, String encoding)
throws ServiceException;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
