You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/14 16:40:25 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/jsp TurbineJspService.java
jvanzyl 01/06/14 07:40:25
Modified: src/java/org/apache/turbine/services/jsp
TurbineJspService.java
Log:
- updating service as per notes.
Revision Changes Path
1.16 +9 -21 jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineJspService.java 2001/05/22 21:02:42 1.15
+++ TurbineJspService.java 2001/06/14 14:40:25 1.16
@@ -54,30 +54,19 @@
* <http://www.apache.org/>.
*/
-// Java Stuff
import java.io.File;
import java.io.IOException;
-
-// Java Servlet Classes
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
-
-// Turbine Stuff
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
-
import org.apache.turbine.services.jsp.util.JspLink;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.services.template.BaseTemplateEngineService;
import org.apache.turbine.services.template.TurbineTemplate;
-import org.apache.velocity.runtime.configuration.Configuration;
-
/**
* This is a Service that can process JSP templates from within a Turbine
* screen.
@@ -86,7 +75,8 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
*/
-public class TurbineJspService extends BaseTemplateEngineService
+public class TurbineJspService
+ extends BaseTemplateEngineService
implements JspService
{
/** The base path[s] prepended to filenames given in arguments */
@@ -101,7 +91,8 @@
/**
* Performs early initialization of this Turbine service.
*/
- public void init(ServletConfig config) throws InitializationException
+ public void init()
+ throws InitializationException
{
try
{
@@ -175,7 +166,7 @@
// get the RequestDispatcher for the JSP
RequestDispatcher dispatcher = data.getServletContext()
- .getRequestDispatcher(relativeTemplateName);
+ .getRequestDispatcher(relativeTemplateName);
try
{
@@ -216,21 +207,18 @@
*/
private void initJsp() throws Exception
{
- ServletContext context = TurbineServlet.getServletContext();
- Configuration config = getConfiguration();
-
/*
* Use the turbine template service to translate
* the template paths.
*/
templatePaths = TurbineTemplate.translateTemplatePaths(
- config.getStringArray("templates"));
+ getConfiguration().getStringArray("templates"));
/*
* Set relative paths from config.
* Needed for javax.servlet.RequestDispatcher
*/
- relativeTemplatePaths = config.getStringArray("templates");
+ relativeTemplatePaths = getConfiguration().getStringArray("templates");
/*
* Make sure that the relative paths begin with /
@@ -243,7 +231,7 @@
}
}
- bufferSize = config.getInt("buffer.size", 8192);
+ bufferSize = getConfiguration().getInt("buffer.size", 8192);
/*
* Register with the template service.
@@ -287,7 +275,7 @@
*/
for (int i = 0; i < relativeTemplatePaths.length; i++)
{
- testTemplatePath[0] = TurbineServlet.getRealPath(relativeTemplatePaths[i]);
+ testTemplatePath[0] = getRealPath(relativeTemplatePaths[i]);
if (TurbineTemplate.templateExists(template, testTemplatePath))
{
return relativeTemplatePaths[i] + template;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org