epugh 2004/11/11 12:09:52
Modified: template/src/java/org/apache/fulcrum/template
BaseTemplateEngineService.java
TemplateHtmlEmail.java TemplateEmail.java
template/src/java/org/apache/fulcrum/template/jsp
TurbineJspService.java
template/xdocs changes.xml
Log:
Fix compile errors introduced by moving facade
Revision Changes Path
1.3 +2 -2
jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/BaseTemplateEngineService.java
Index: BaseTemplateEngineService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/BaseTemplateEngineService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseTemplateEngineService.java 8 Nov 2004 09:49:33 -0000 1.2
+++ BaseTemplateEngineService.java 11 Nov 2004 20:09:52 -0000 1.3
@@ -223,7 +223,7 @@
/**
* Avalon component lifecycle method
*/
- public void service(ServiceManager manager)
+ public void service(ServiceManager manager) throws ServiceException
{
this.manager = manager;
1.3 +17 -3
jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/TemplateHtmlEmail.java
Index: TemplateHtmlEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/TemplateHtmlEmail.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateHtmlEmail.java 8 Nov 2004 09:49:33 -0000 1.2
+++ TemplateHtmlEmail.java 11 Nov 2004 20:09:52 -0000 1.3
@@ -75,6 +75,12 @@
/** The map of embedded files. */
private Hashtable embmap = null;
+
+ /**
+ * The templateService to use in generating text
+ *
+ */
+ private TemplateService templateService;
/**
* Constructor, sets the TemplateContext object.
@@ -135,13 +141,13 @@
{
if(htmlTemplate != null)
{
- htmlbody = TemplateServiceFacade.handleRequest(
+ htmlbody = templateService.handleRequest(
context, htmlTemplate);
}
if(textTemplate != null)
{
- textbody = TemplateServiceFacade.handleRequest(
+ textbody = templateService.handleRequest(
context, textTemplate);
}
}
@@ -210,5 +216,13 @@
String cid = (String)embmap.get(filename);
return "cid:"+cid;
}
+
+ /**
+ * A javabean style setter for passing in manually a templateservice
+ * @param templateService The templateService to set.
+ */
+ public void setTemplateService(TemplateService templateService) {
+ this.templateService = templateService;
+ }
}
1.3 +17 -2
jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/TemplateEmail.java
Index: TemplateEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/TemplateEmail.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateEmail.java 8 Nov 2004 09:49:33 -0000 1.2
+++ TemplateEmail.java 11 Nov 2004 20:09:52 -0000 1.3
@@ -145,6 +145,12 @@
* The charset
*/
private String charset = null;
+
+ /**
+ * The templateService to use in generating text
+ *
+ */
+ private TemplateService templateService;
/**
* Constructor
@@ -417,7 +423,7 @@
// Process the template.
StringWriter sw = new StringWriter();
- TemplateServiceFacade.handleRequest(context,template, sw);
+ templateService.handleRequest(context,template, sw);
String body = sw.toString();
// If the caller desires word-wrapping, do it here
@@ -455,7 +461,16 @@
se.send();
}
+
+
+ /**
+ * A javabean style setter for passing in manually a templateservice
+ * @param templateService The templateService to set.
+ */
+ public void setTemplateService(TemplateService templateService) {
+ this.templateService = templateService;
+ }
/**
* if any reply-to email addresses exist, add them to the SimpleEmail
*
1.3 +19 -5
jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/template/src/java/org/apache/fulcrum/template/jsp/TurbineJspService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineJspService.java 8 Nov 2004 09:49:37 -0000 1.2
+++ TurbineJspService.java 11 Nov 2004 20:09:52 -0000 1.3
@@ -25,10 +25,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.fulcrum.template.BaseTemplateEngineService;
import org.apache.fulcrum.template.TemplateContext;
import org.apache.fulcrum.template.TemplateException;
-import org.apache.fulcrum.template.TemplateServiceFacade;
+import org.apache.fulcrum.template.TemplateService;
/**
* This is a Service that can process JSP templates from within a Turbine
@@ -54,6 +57,8 @@
/** The buffer size for the output stream. */
private int bufferSize;
+ /** The class to handle looking up template names */
+ private TemplateService templateService;
/**
* Adds some convenience objects to the request. For example an instance
* of JspLink which can be used to generate links to other templates.
@@ -206,7 +211,7 @@
*/
public boolean templateExists(String template)
{
- return TemplateServiceFacade.templateExists(template, templatePaths);
+ return templateService.templateExists(template, templatePaths);
}
/**
* Searchs for a template in the default.template path[s] and
@@ -232,8 +237,7 @@
for (int i = 0; i < relativeTemplatePaths.length; i++)
{
testTemplatePath[0] = getRealPath(relativeTemplatePaths[i]);
- if (TemplateServiceFacade
- .templateExists(template, testTemplatePath))
+ if (templateService.templateExists(template, testTemplatePath))
{
return relativeTemplatePaths[i] + template;
}
@@ -295,7 +299,7 @@
registerConfiguration(conf, "jsp");
// Use the turbine template service to translate the template paths.
- templatePaths =
TemplateServiceFacade.translateTemplatePaths(rawPaths);
+ templatePaths = templateService.translateTemplatePaths(rawPaths);
// Set relative paths from config.
// Needed for javax.servlet.RequestDispatcher
@@ -310,4 +314,14 @@
}
}
+ // ---------------- Avalon Lifecycle Methods ---------------------
+ /**
+ * Avalon component lifecycle method
+ */
+ public void service(ServiceManager manager) throws ServiceException
+ {
+ super.service(manager);
+ templateService =
(TemplateService)manager.lookup(TemplateService.ROLE);
+
+ }
}
1.3 +4 -0 jakarta-turbine-fulcrum/template/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/template/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 11 Nov 2004 10:07:18 -0000 1.2
+++ changes.xml 11 Nov 2004 20:09:52 -0000 1.3
@@ -7,6 +7,10 @@
<body>
<release version="1.0-alpha-2" date="in CVS">
+ <action dev="epugh" type="add">
+ Fix EmailTemplate and HtmlEmailTemplate by providing a
templateService
+ that can be manually passed in. Should be avalon components instead.
+ </action>
<action dev="epugh" type="remove">
Remove facade class, this is implementation specific.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
