henning 2003/03/13 06:03:48
Modified: src/java/org/apache/turbine/services/rundata
RunDataService.java TurbineRunDataService.java
Log:
Remove some superflous static final from the interface.
Use the new C'tor of ServerData to get the object from the http request
Revision Changes Path
1.6 +6 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/RunDataService.java
Index: RunDataService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/RunDataService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RunDataService.java 9 Mar 2003 03:06:30 -0000 1.5
+++ RunDataService.java 13 Mar 2003 14:03:48 -0000 1.6
@@ -77,19 +77,19 @@
extends Service
{
/** The key under which this service is stored in TurbineServices. */
- static final String SERVICE_NAME = "RunDataService";
+ String SERVICE_NAME = "RunDataService";
/** The default parser configuration key. */
- static final String DEFAULT_CONFIG = "default";
+ String DEFAULT_CONFIG = "default";
/** The property for the implemention of the RunData object */
- public static final String RUN_DATA_KEY = "run.data";
+ String RUN_DATA_KEY = "run.data";
/** The property for the implemention of the ParameterParser. */
- public static final String PARAMETER_PARSER_KEY = "parameter.parser";
+ String PARAMETER_PARSER_KEY = "parameter.parser";
/** The property for the implemention of the CookieParser. */
- public static final String COOKIE_PARSER_KEY = "cookie.parser";
+ String COOKIE_PARSER_KEY = "cookie.parser";
/**
* Gets a default RunData object.
1.8 +6 -13
jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineRunDataService.java 9 Mar 2003 03:06:30 -0000 1.7
+++ TurbineRunDataService.java 13 Mar 2003 14:03:48 -0000 1.8
@@ -70,6 +70,7 @@
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.pool.PoolService;
+import org.apache.turbine.services.pool.TurbinePool;
import org.apache.turbine.util.CookieParser;
import org.apache.turbine.util.ParameterParser;
@@ -183,13 +184,12 @@
}
}
}
- pool = (PoolService) TurbineServices.getInstance()
- .getService(PoolService.SERVICE_NAME);
+ pool = TurbinePool.getService();
if (pool == null)
{
throw new InitializationException("RunData Service requires"
- + " configured Pool Service!");
+ + " configured Pool Service!");
}
setInit(true);
@@ -275,15 +275,8 @@
data.setServletConfig(config);
// Set the ServerData.
- String contextPath = req.getContextPath();
- String scriptName = req.getServletPath();
-
- data.setServerData(new ServerData(req.getServerName(),
- req.getServerPort(),
- req.getScheme(),
- scriptName,
- contextPath));
-
+ data.setServerData(new ServerData(req));
+
return (RunData) data;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
