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/09/16 05:32:02 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/servlet TurbineServletService.java
jvanzyl 01/09/15 20:32:02
Modified: src/java/org/apache/turbine/services/servlet
TurbineServletService.java
Log:
- delegating the retrieval of the server info to Turbine.java
Revision Changes Path
1.2 +5 -56 jakarta-turbine-2/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
Index: TurbineServletService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/servlet/TurbineServletService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineServletService.java 2001/08/16 05:09:21 1.1
+++ TurbineServletService.java 2001/09/16 03:32:02 1.2
@@ -55,16 +55,12 @@
*/
import java.io.InputStream;
-
import java.net.URL;
import java.net.MalformedURLException;
-
import java.util.StringTokenizer;
-
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.Log;
@@ -83,7 +79,7 @@
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
* @author <a href="mailto:jvanzyl@periapt.com.com">Jason van Zyl</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineServletService.java,v 1.1 2001/08/16 05:09:21 jvanzyl Exp $
+ * @version $Id: TurbineServletService.java,v 1.2 2001/09/16 03:32:02 jvanzyl Exp $
*/
public class TurbineServletService
extends TurbineBaseService implements ServletService
@@ -91,11 +87,6 @@
private ServletContext servletContext = null;
private ServletConfig servletConfig = null;
- private String serverName = null;
- private String serverPort = null;
- private String serverScheme = null;
- private String contextPath = null;
-
/**
* Called during Turbine.init()
*
@@ -115,48 +106,6 @@
Log.error ( "Cannot initialize TurbineServletService." );
Log.error (e);
}
- }
-
- /**
- * Setup some standard information about our webapp
- * that may be of use in other classes of our webapp
- * that do not have direct access to the RunData
- * class.
- */
- public void init(RunData data)
- {
- serverName = data.getRequest().getServerName();
- serverPort = Integer.toString(data.getRequest().getServerPort());
- serverScheme = data.getRequest().getScheme();
-
- /*
- * Allow Turbine to work with both 2.2 (and 2.1) and 2.0
- * Servlet API.
- */
- Class jsdkClass = HttpServletRequest.class;
-
- try
- {
- java.lang.reflect.Method meth =
- jsdkClass.getDeclaredMethod("getContextPath", null);
-
- contextPath = (String)meth.invoke(data.getRequest(), null);
- }
- catch (Exception ex)
- {
- // Ignore a NoSuchMethodException because it means we are
- // using Servlet API 2.0. Make sure scriptName is not
- // null.
- contextPath = "";
- }
-
-// contextPath = data.getRequest().getContextPath();
-
- Log.debug("[TurbineServletService] serverName: " + serverName);
- Log.debug("[TurbineServletService] serverScheme: " + serverScheme);
- Log.debug("[TurbineServletService] serverPort: " + serverPort);
- Log.debug("[TurbineServletService] contextPath: " + contextPath);
-
setInit(true);
}
@@ -268,7 +217,7 @@
*/
public String getServerScheme()
{
- return serverScheme;
+ return Turbine.getServerScheme();
}
/**
@@ -280,7 +229,7 @@
*/
public String getServerName()
{
- return serverName;
+ return Turbine.getServerName();
}
/**
@@ -292,7 +241,7 @@
*/
public String getServerPort()
{
- return serverPort;
+ return Turbine.getServerPort();
}
/**
@@ -303,7 +252,7 @@
*/
public String getContextPath()
{
- return contextPath;
+ return Turbine.getContextPath();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org