jon 01/05/19 16:03:53
Modified: src/java/org/apache/turbine/services/pull
TurbinePullService.java
src/java/org/apache/turbine/services/servlet
TurbineServletService.java
Log:
removed some extra debugging stuff that was left over by accident
Revision Changes Path
1.21 +1 -5
jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TurbinePullService.java 2001/05/19 21:44:08 1.20
+++ TurbinePullService.java 2001/05/19 23:03:53 1.21
@@ -147,7 +147,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: TurbinePullService.java,v 1.20 2001/05/19 21:44:08 jon Exp $
+ * @version $Id: TurbinePullService.java,v 1.21 2001/05/19 23:03:53 jon Exp $
*/
public class TurbinePullService extends TurbineBaseService
implements PullService
@@ -269,8 +269,6 @@
*/
private void initPull() throws Exception
{
-
- Log.debug ("Start PullService init()");
Properties props = getProperties();
/*
@@ -328,7 +326,6 @@
*
* tool.persistent.ui =
org.apache.turbine.services.pull.util.PersistentUIManager
*/
-
globalTools = getTools(GLOBAL_TOOL);
requestTools = getTools(REQUEST_TOOL);
sessionTools = getTools(SESSION_TOOL);
@@ -339,7 +336,6 @@
*/
globalContext = new VelocityContext();
populateWithGlobalTools(globalContext);
- Log.debug ("Finish PullService init()");
}
/**
@@ -383,7 +379,7 @@
classes.add(new ToolData(toolName, toolClassName, toolClass));
Log.info("Instantiated tool class " + toolClassName
- + " to add to the context as " + toolName);
+ + " to add to the context as '$" + toolName + "'");
}
catch (Exception e)
{
1.11 +2 -3
jakarta-turbine/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
Index: TurbineServletService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/servlet/TurbineServletService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineServletService.java 2001/05/19 21:44:08 1.10
+++ TurbineServletService.java 2001/05/19 23:03:53 1.11
@@ -83,7 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: TurbineServletService.java,v 1.10 2001/05/19 21:44:08 jon Exp $
+ * @version $Id: TurbineServletService.java,v 1.11 2001/05/19 23:03:53 jon Exp $
*/
public class TurbineServletService
extends TurbineBaseService implements ServletService
@@ -132,6 +132,7 @@
/*
* Allow Turbine to work with both 2.2 (and 2.1) and 2.0
* Servlet API.
+ */
Class jsdkClass = HttpServletRequest.class;
try
@@ -148,9 +149,8 @@
// null.
contextPath = "";
}
- */
- contextPath = data.getRequest().getContextPath();
+// contextPath = data.getRequest().getContextPath();
Log.debug("[TurbineServletService] serverName: " + serverName);
Log.debug("[TurbineServletService] serverScheme: " + serverScheme);
@@ -158,7 +158,6 @@
Log.debug("[TurbineServletService] contextPath: " + contextPath);
setInit(true);
- System.out.println ("init(RD) Finish: " + new java.util.Date() );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
