jmcnally 01/12/03 19:26:34
Modified: src/services/java/org/apache/fulcrum/velocity
TurbineVelocityService.java
Log:
fixing conflict from my last commit.
Revision Changes Path
1.11 +0 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineVelocityService.java 2001/12/04 03:16:40 1.10
+++ TurbineVelocityService.java 2001/12/04 03:26:34 1.11
@@ -98,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.10 2001/12/04 03:16:40 jmcnally
Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.11 2001/12/04 03:26:34 jmcnally
Exp $
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
@@ -338,20 +338,11 @@
{
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
}
catch (Exception e)
{
-<<<<<<< TurbineVelocityService.java
renderingError(filename, e);
-=======
- Velocity.mergeTemplate(filename, vc, writer);
->>>>>>> 1.9
}
handleRequest(context, filename, writer, encoding);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
