jvanzyl 01/08/01 08:35:35
Modified: src/java/org/apache/turbine/services/template
BaseTemplateEngineService.java
TemplateEngineService.java TemplateService.java
TurbineTemplate.java TurbineTemplateService.java
Log:
- reflect changes in services
Revision Changes Path
1.17 +8 -8
jakarta-turbine/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
Index: BaseTemplateEngineService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BaseTemplateEngineService.java 2001/07/24 03:10:16 1.16
+++ BaseTemplateEngineService.java 2001/08/01 15:35:34 1.17
@@ -57,16 +57,16 @@
import java.io.OutputStream;
import java.util.Iterator;
import java.util.Hashtable;
-import org.apache.turbine.services.BaseService;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.ServiceException;
/**
* The base implementation of Turbine {@link
- * org.apache.turbine.services.template.TemplateEngineService}.
+ * org.apache.fulcrum.template.TemplateEngineService}.
*
* @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.16 2001/07/24 03:10:16 dlr Exp $
+ * @version $Id: BaseTemplateEngineService.java,v 1.17 2001/08/01 15:35:34 jvanzyl
Exp $
*/
public abstract class BaseTemplateEngineService
extends BaseService
@@ -86,7 +86,7 @@
private Hashtable configuration = new Hashtable();
/**
- * @see
org.apache.turbine.services.template.TemplateEngineService#registerConfiguration
+ * @see org.apache.fulcrum.template.TemplateEngineService#registerConfiguration
*/
public void registerConfiguration(String defaultExt)
{
@@ -95,7 +95,7 @@
}
/**
- * @see
org.apache.turbine.services.template.TemplateEngineService#getTemplateEngineServiceConfiguration
+ * @see
org.apache.fulcrum.template.TemplateEngineService#getTemplateEngineServiceConfiguration
*/
public Hashtable getTemplateEngineServiceConfiguration()
{
@@ -103,7 +103,7 @@
}
/**
- * @see
org.apache.turbine.services.template.TemplateEngineService#getAssociatedFileExtensions
+ * @see
org.apache.fulcrum.template.TemplateEngineService#getAssociatedFileExtensions
*/
public String[] getAssociatedFileExtensions()
{
@@ -149,7 +149,7 @@
}
/**
- * @see
org.apache.turbine.services.template.TemplateEngineService#templateExists
+ * @see org.apache.fulcrum.template.TemplateEngineService#templateExists
*/
public abstract boolean templateExists(String template);
1.12 +5 -5
jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateEngineService.java
Index: TemplateEngineService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateEngineService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TemplateEngineService.java 2001/07/24 02:41:34 1.11
+++ TemplateEngineService.java 2001/08/01 15:35:34 1.12
@@ -57,7 +57,7 @@
import java.io.OutputStream;
import java.util.Hashtable;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
/**
* This is the interface that all template engine services must adhere
@@ -66,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.11 2001/07/24 02:41:34 dlr Exp $ */
+ * @version $Id: TemplateEngineService.java,v 1.12 2001/08/01 15:35:34 jvanzyl Exp
$ */
public interface TemplateEngineService
{
public static final String TEMPLATE_EXTENSIONS = "template.extension";
@@ -91,7 +91,7 @@
/**
* Supplies the file extension to key this engine in {@link
- * org.apache.turbine.services.template.TemplateService}'s
+ * org.apache.fulcrum.template.TemplateService}'s
* registry with.
*/
public String[] getAssociatedFileExtensions();
@@ -111,14 +111,14 @@
public boolean templateExists(String template);
/**
- * @see org.apache.turbine.services.template.TemplateEngineService
+ * @see org.apache.fulcrum.template.TemplateEngineService
*/
public abstract String handleRequest(TemplateContext context,
String template)
throws ServiceException;
/**
- * @see org.apache.turbine.services.template.TemplateEngineService
+ * @see org.apache.fulcrum.template.TemplateEngineService
*/
public abstract void handleRequest(TemplateContext context,
String template,
1.24 +4 -4
jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java
Index: TemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TemplateService.java 2001/07/24 02:26:21 1.23
+++ TemplateService.java 2001/08/01 15:35:34 1.24
@@ -56,8 +56,8 @@
import java.io.OutputStream;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.Service;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.Service;
/**
* This service provides a method for mapping templates to their
@@ -70,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.23 2001/07/24 02:26:21 dlr Exp $
+ * @version $Id: TemplateService.java,v 1.24 2001/08/01 15:35:34 jvanzyl Exp $
*/
public interface TemplateService
extends Service
@@ -94,7 +94,7 @@
/**
* Delegates to the appropriate {@link
- * org.apache.turbine.services.template.TemplateEngineService} to
+ * org.apache.fulcrum.template.TemplateEngineService} to
* check the existance of the specified template.
*
* @param template The template to check for the existance of.
1.16 +3 -3
jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplate.java
Index: TurbineTemplate.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplate.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineTemplate.java 2001/07/20 21:32:48 1.15
+++ TurbineTemplate.java 2001/08/01 15:35:34 1.16
@@ -56,15 +56,15 @@
import java.io.OutputStream;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.TurbineServices;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.TurbineServices;
/**
* This is a simple static accessor to common TemplateService tasks such as
* 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.15 2001/07/20 21:32:48 jon Exp $
+ * @version $Id: TurbineTemplate.java,v 1.16 2001/08/01 15:35:34 jvanzyl Exp $
*/
public abstract class TurbineTemplate
{
1.56 +7 -7
jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- TurbineTemplateService.java 2001/07/24 01:13:35 1.55
+++ TurbineTemplateService.java 2001/08/01 15:35:34 1.56
@@ -60,9 +60,9 @@
import java.util.Hashtable;
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.BaseService;
-import org.apache.turbine.services.InitializationException;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.InitializationException;
import org.apache.turbine.services.pull.TurbinePull;
/**
@@ -103,7 +103,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.55 2001/07/24 01:13:35 dlr Exp $
+ * @version $Id: TurbineTemplateService.java,v 1.56 2001/08/01 15:35:34 jvanzyl Exp
$
*/
public class TurbineTemplateService
extends BaseService
@@ -122,7 +122,7 @@
/**
* The mappings of template file extensions to {@link
- * org.apache.turbine.services.template.TemplateEngineService}
+ * org.apache.fulcrum.template.TemplateEngineService}
* implementations. Implementing template engines can locate
* templates within the capability of any resource loaders they
* may posses, and other template engines are stuck with file
@@ -212,7 +212,7 @@
/**
* Delegates to the appropriate {@link
- * org.apache.turbine.services.template.TemplateEngineService} to
+ * org.apache.fulcrum.template.TemplateEngineService} to
* check the existance of the specified template.
*
* @param template The template to check for the existance of.
@@ -260,7 +260,7 @@
}
/**
- * The {@link org.apache.turbine.services.template.TemplateEngineService}
+ * The {@link org.apache.fulcrum.template.TemplateEngineService}
* associated with the specified template's file extension.
*
* @param template The template name.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
