jvanzyl 01/09/02 19:02:00
Modified: src/java/org/apache/turbine Turbine.java
src/tool/org/apache/turbine/tool ContentURI.java OMTool.java
RelativeTemplateLink.java TemplateLink.java
TemplateLinkWithSlash.java UIManager.java
Removed: src/java/org/apache/turbine/services/rundata
RunDataFactory.java
Log:
- removing the use of RunDataFactory and using the RunDataService directly.
the previous assumption was that the RunDataService would be used if
it was configured, and if it wasn't than the pool service would be
used to get instances of RunData.
i think we can safely make the assumption that the RunData service
will be running and we can state that it is a requirement. the TDK,
and most applications have always had the RunDataService configured
for service so the logic in RunData factory was never used.
Revision Changes Path
1.4 +10 -4 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Turbine.java 2001/09/01 16:58:11 1.3
+++ Turbine.java 2001/09/03 02:01:59 1.4
@@ -77,7 +77,7 @@
import org.apache.fulcrum.TurbineServices;
import org.apache.log4j.Category;
import org.apache.turbine.modules.ModuleLoader;
-import org.apache.turbine.services.rundata.RunDataFactory;
+import org.apache.turbine.services.rundata.RunDataService;
/**
* Turbine is the main servlet for the entire system. It is <code>final</code>
@@ -111,7 +111,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: Turbine.java,v 1.3 2001/09/01 16:58:11 jvanzyl Exp $
+ * @version $Id: Turbine.java,v 1.4 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -248,7 +248,7 @@
// Get general RunData here...
// Perform turbine specific initialization below.
- data = RunDataFactory.getRunData(req, res, getServletConfig());
+ data = runDataService.getRunData(req, res, getServletConfig());
// If this is the first invocation, perform some
// initialization. Certain services need RunData to initialize
@@ -304,7 +304,7 @@
}
// Return the used RunData to the factory for recycling.
- RunDataFactory.putRunData(data);
+ runDataService.putRunData(data);
}
}
@@ -484,6 +484,8 @@
private static Pipeline pipeline;
+ private static RunDataService runDataService;
+
/**
* A static configuration method that is called by the Turbine servlet
* or by non-servlet applications for configuring Turbine. It loads
@@ -592,6 +594,10 @@
.newInstance();
pipeline.init();
+
+ // Setup the RunData service for the application
+ runDataService = (RunDataService) TurbineServices.getInstance()
+ .getService(RunDataService.SERVICE_NAME);
}
/**
1.2 +2 -2
jakarta-turbine-3/src/tool/org/apache/turbine/tool/ContentURI.java
Index: ContentURI.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/ContentURI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentURI.java 2001/08/16 04:41:50 1.1
+++ ContentURI.java 2001/09/03 02:01:59 1.2
@@ -56,7 +56,7 @@
import java.lang.reflect.Method;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.DynamicURI;
import org.apache.turbine.services.pull.ApplicationTool;
/**
@@ -66,7 +66,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Cameron Riley</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: ContentURI.java,v 1.1 2001/08/16 04:41:50 jvanzyl Exp $
+ * @version $Id: ContentURI.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class ContentURI
extends DynamicURI
1.2 +2 -2 jakarta-turbine-3/src/tool/org/apache/turbine/tool/OMTool.java
Index: OMTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/OMTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OMTool.java 2001/08/16 04:41:50 1.1
+++ OMTool.java 2001/09/03 02:01:59 1.2
@@ -62,7 +62,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.ParameterParser;
-import org.apache.turbine.util.Log;
+import org.apache.turbine.Log;
import org.apache.turbine.TurbineException;
import org.apache.turbine.services.pull.ApplicationTool;
@@ -70,7 +70,7 @@
* A Pull tool to make om objects available to a template
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: OMTool.java,v 1.1 2001/08/16 04:41:50 jvanzyl Exp $
+ * @version $Id: OMTool.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class OMTool
implements ApplicationTool, Recyclable
1.2 +2 -2
jakarta-turbine-3/src/tool/org/apache/turbine/tool/RelativeTemplateLink.java
Index: RelativeTemplateLink.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/RelativeTemplateLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelativeTemplateLink.java 2001/08/16 04:41:51 1.1
+++ RelativeTemplateLink.java 2001/09/03 02:01:59 1.2
@@ -55,7 +55,7 @@
*/
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.util.RelativeDynamicURI;
+import org.apache.turbine.RelativeDynamicURI;
import org.apache.turbine.RunData;
import org.apache.turbine.services.pull.ApplicationTool;
@@ -70,7 +70,7 @@
*
* @author <a href="[EMAIL PROTECTED]">John D. McNally</a>
* @author see the authors of TemplateLink
- * @version $Id: RelativeTemplateLink.java,v 1.1 2001/08/16 04:41:51 jvanzyl Exp $
+ * @version $Id: RelativeTemplateLink.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class RelativeTemplateLink
extends RelativeDynamicURI
1.2 +2 -2
jakarta-turbine-3/src/tool/org/apache/turbine/tool/TemplateLink.java
Index: TemplateLink.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/TemplateLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateLink.java 2001/08/16 04:41:50 1.1
+++ TemplateLink.java 2001/09/03 02:01:59 1.2
@@ -55,7 +55,7 @@
*/
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.DynamicURI;
import org.apache.turbine.RunData;
import org.apache.turbine.services.pull.ApplicationTool;
@@ -73,7 +73,7 @@
* @author <a href="[EMAIL PROTECTED]">Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
- * @version $Id: TemplateLink.java,v 1.1 2001/08/16 04:41:50 jvanzyl Exp $
+ * @version $Id: TemplateLink.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class TemplateLink
extends DynamicURI
1.2 +2 -2
jakarta-turbine-3/src/tool/org/apache/turbine/tool/TemplateLinkWithSlash.java
Index: TemplateLinkWithSlash.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/TemplateLinkWithSlash.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateLinkWithSlash.java 2001/08/16 04:41:51 1.1
+++ TemplateLinkWithSlash.java 2001/09/03 02:01:59 1.2
@@ -56,7 +56,7 @@
//import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.DynamicURI;
import org.apache.turbine.RunData;
/**
@@ -70,7 +70,7 @@
* those who do not mind the inefficiency.
*
* @author <a href="[EMAIL PROTECTED]">John D. McNally</a>
- * @version $Id: TemplateLinkWithSlash.java,v 1.1 2001/08/16 04:41:51 jvanzyl Exp $
+ * @version $Id: TemplateLinkWithSlash.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class TemplateLinkWithSlash
extends TemplateLink
1.2 +2 -2
jakarta-turbine-3/src/tool/org/apache/turbine/tool/UIManager.java
Index: UIManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/UIManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UIManager.java 2001/08/16 04:41:51 1.1
+++ UIManager.java 2001/09/03 02:01:59 1.2
@@ -58,7 +58,7 @@
import java.util.Hashtable;
import java.util.Properties;
import org.apache.turbine.Turbine;
-import org.apache.turbine.util.Log;
+import org.apache.turbine.Log;
import org.apache.turbine.RunData;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.services.pull.TurbinePull;
@@ -100,7 +100,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Coltman</a>
- * @version $Id: UIManager.java,v 1.1 2001/08/16 04:41:51 jvanzyl Exp $
+ * @version $Id: UIManager.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
*/
public class UIManager implements ApplicationTool
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
