jvanzyl 02/01/17 08:38:55
Modified: src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/pipeline DefaultResolver.java
DefaultTargetValve.java TurbinePipeline.java
Removed: src/java/org/apache/turbine/pipeline
turbine-classic-pipeline.xml
src/test/org/apache/turbine BaseTestCase.java
Log:
- removed the caching logic as we will probably be using JCS, in any
event I want things to be clean before anyone starts ripping and
tearing again.
Revision Changes Path
1.22 +5 -6 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Turbine.java 11 Jan 2002 23:59:29 -0000 1.21
+++ Turbine.java 17 Jan 2002 16:38:54 -0000 1.22
@@ -121,7 +121,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.21 2002/01/11 23:59:29 dlr Exp $
+ * @version $Id: Turbine.java,v 1.22 2002/01/17 16:38:54 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -389,8 +389,7 @@
try
{
// try again with a different target
- data.setTarget(configuration
- .getString("template.error","/Error.vm"));
+
data.setTarget(configuration.getString("template.error","/Error.vm"));
data.setStackTrace(StringUtils.stackTrace(t), t);
// We act as a minimal Pipeline here to run the target
@@ -680,9 +679,9 @@
{
// Turbine's standard Pipeline implementation uses
// descriptors to define what Valves are attached to it.
- String descriptorPath =
- configuration.getString("pipeline.default.descriptor",
- TurbinePipeline.CLASSIC_PIPELINE);
+ String descriptorPath = configuration.getString(
+ "pipeline.default.descriptor", TurbinePipeline.CLASSIC_PIPELINE);
+
Log.debug("[Turbine] Using descriptor path: " + descriptorPath);
Mapper m = new Mapper();
m.setInclusionRule("valveDefinition", "");
1.10 +3 -94
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java
Index: DefaultResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultResolver.java 7 Dec 2001 23:05:43 -0000 1.9
+++ DefaultResolver.java 17 Jan 2002 16:38:54 -0000 1.10
@@ -134,19 +134,13 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
- * @version $Id: DefaultResolver.java,v 1.9 2001/12/07 23:05:43 jon Exp $
+ * @version $Id: DefaultResolver.java,v 1.10 2002/01/17 16:38:54 jvanzyl Exp $
*/
public class DefaultResolver
implements Resolver, TurbineConstants
{
protected String defaultTemplate;
- private boolean doTemplateCache;
- private boolean doModuleCache;
-
- private DoubleKeyCache templateCache;
- private DoubleKeyCache moduleCache;
-
public void init()
throws Exception
{
@@ -155,37 +149,14 @@
"." +
Turbine.getConfiguration().getString("template.default.extension");
- //
// insist that the default template starts with a '/'
- //
int idx = defaultTemplate.indexOf('/');
if (idx == -1 || idx > 0)
{
defaultTemplate = "/" + defaultTemplate;
}
- //
- // set up the cache
- //
- doTemplateCache = Turbine.getConfiguration()
- .getBoolean(RESOLVER_TEMPLATE_CACHE, false);
-
- doModuleCache = Turbine.getConfiguration()
- .getBoolean(RESOLVER_MODULE_CACHE, false);
-
Log.debug("DefaultResolver: default template " + defaultTemplate);
- Log.debug("DefaultResolver: cache templates " + doTemplateCache);
- Log.debug("DefaultResolver: cache modules " + doModuleCache);
-
- if (doTemplateCache)
- {
- templateCache = new DoubleKeyCache();
- }
-
- if (doModuleCache)
- {
- moduleCache = new DoubleKeyCache();
- }
}
/**
@@ -197,21 +168,7 @@
public String getTemplate(String moduleType, String targetTemplate)
throws Exception
{
- if (! doTemplateCache)
- {
- return findTemplate(moduleType, targetTemplate);
- }
-
- //
- // caching is on
- //
- String template = (String)templateCache.get(moduleType, targetTemplate);
- if (template == null)
- {
- template = findTemplate(moduleType, targetTemplate);
- templateCache.put(moduleType, targetTemplate, template);
- }
- return template;
+ return findTemplate(moduleType, targetTemplate);
}
/**
@@ -225,21 +182,7 @@
public Module getModule(String type, String name)
throws Exception
{
- if (! doModuleCache)
- {
- return findModule(type, name);
- }
-
- //
- // caching is on
- //
- Module module = (Module)moduleCache.get(type, name);
- if (module == null)
- {
- module = findModule(type, name);
- moduleCache.put(type, name, module);
- }
- return module;
+ return findModule(type, name);
}
protected String findTemplate(String moduleType, String targetTemplate)
@@ -326,42 +269,8 @@
protected Module findModule(String type, String name)
throws Exception
{
- //
// just use the module loader's default algorithm
// perhaps that code should be put here
- //
return Turbine.getModuleLoader().getModule(type,name);
- }
-}
-
-class DoubleKeyCache
-{
- Map map = null;
-
- public DoubleKeyCache()
- {
- // map must be a synchronized data structure
- map = new FastHashMap();
- }
-
- public Object put(Object key1, Object key2, Object value)
- {
- Map table = (Map) map.get(key1);
- if (table == null)
- {
- table = new FastHashMap();
- map.put(key1, table);
- }
- return table.put(key2, value);
- }
-
- public Object get(Object key1, Object key2)
- {
- Map table = (Map) map.get(key1);
- if (table == null)
- {
- return null;
- }
- return table.get(key2);
}
}
1.4 +2 -3
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
Index: DefaultTargetValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTargetValve.java 11 Jan 2002 23:20:16 -0000 1.3
+++ DefaultTargetValve.java 17 Jan 2002 16:38:54 -0000 1.4
@@ -81,7 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: DefaultTargetValve.java,v 1.3 2002/01/11 23:20:16 dlr Exp $
+ * @version $Id: DefaultTargetValve.java,v 1.4 2002/01/17 16:38:54 jvanzyl Exp $
*/
public class DefaultTargetValve
implements Valve
@@ -176,8 +176,7 @@
// now we can use the renderer here
// use the renderer to start the whole shabang
- String layoutTemplate = Turbine.getResolver()
- .getTemplate("layouts", target);
+ String layoutTemplate = Turbine.getResolver().getTemplate("layouts",
target);
String out = r.render(data, layoutTemplate);
data.getOut().print(out);
1.7 +1 -1
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Index: TurbinePipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbinePipeline.java 11 Jan 2002 23:43:09 -0000 1.6
+++ TurbinePipeline.java 17 Jan 2002 16:38:54 -0000 1.7
@@ -76,7 +76,7 @@
* The "Turbine Classic" pipeline.
*/
public static String CLASSIC_PIPELINE =
- "org/apache/turbine/pipeline/turbine-classic-pipeline.xml";
+ "conf/turbine-classic-pipeline.xml";
/**
* Name of this pipeline.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
