You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2009/02/10 20:40:11 UTC
svn commit: r743072 - in /turbine/core/trunk/src/java/org/apache/turbine:
modules/ services/assemblerbroker/util/java/
services/assemblerbroker/util/python/
Author: tv
Date: Tue Feb 10 19:40:09 2009
New Revision: 743072
URL: http://svn.apache.org/viewvc?rev=743072&view=rev
Log:
Added getLoader() and getCacheSize() methods.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/Loader.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaActionFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaLayoutFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaNavigationFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaPageFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScheduledJobFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScreenFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Loader.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Loader.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Loader.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Loader.java Tue Feb 10 19:40:09 2009
@@ -1,6 +1,5 @@
package org.apache.turbine.modules;
-import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,12 +27,21 @@
* @version $Id$
*/
-public interface Loader extends AssemblerFactory
+public interface Loader
{
/**
+ * Get an Assembler.
+ *
+ * @param name name of the requested Assembler
+ * @return an Assembler
+ * @throws Exception generic exception
+ */
+ Assembler getAssembler(String name) throws Exception;
+
+ /**
* Get the size of a possibly configured cache
*
* @return the size of the cache in bytes
*/
- public int getCacheSize();
+ int getCacheSize();
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaActionFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaActionFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaActionFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaActionFactory.java Tue Feb 10 19:40:09 2009
@@ -22,6 +22,7 @@
import org.apache.turbine.modules.Action;
+import org.apache.turbine.modules.ActionLoader;
import org.apache.turbine.modules.Assembler;
import org.apache.turbine.modules.Loader;
@@ -35,7 +36,6 @@
*/
public class JavaActionFactory
extends JavaBaseFactory
- implements Loader
{
/**
* Get an Assembler.
@@ -48,9 +48,13 @@
return getAssembler(Action.PREFIX, name);
}
- public int getCacheSize()
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
{
- // TODO Auto-generated method stub
- return 0;
+ return ActionLoader.getInstance();
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaBaseFactory.java Tue Feb 10 19:40:09 2009
@@ -31,6 +31,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.modules.Assembler;
import org.apache.turbine.modules.GenericLoader;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
/**
@@ -133,4 +134,22 @@
return assembler;
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public abstract Loader getLoader();
+
+ /**
+ * Get the size of a possibly configured cache
+ *
+ * @return the size of the cache in bytes
+ */
+ public int getCacheSize()
+
+ {
+ return getLoader().getCacheSize();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaLayoutFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaLayoutFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaLayoutFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaLayoutFactory.java Tue Feb 10 19:40:09 2009
@@ -23,6 +23,8 @@
import org.apache.turbine.modules.Assembler;
import org.apache.turbine.modules.Layout;
+import org.apache.turbine.modules.LayoutLoader;
+import org.apache.turbine.modules.Loader;
/**
* A screen factory that attempts to load a java class from
@@ -45,4 +47,14 @@
{
return getAssembler(Layout.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return LayoutLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaNavigationFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaNavigationFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaNavigationFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaNavigationFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.Navigation;
+import org.apache.turbine.modules.NavigationLoader;
/**
* A screen factory that attempts to load a java class from
@@ -45,4 +47,14 @@
{
return getAssembler(Navigation.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return NavigationLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaPageFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaPageFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaPageFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaPageFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.Page;
+import org.apache.turbine.modules.PageLoader;
/**
* A screen factory that attempts to load a java class from
@@ -45,4 +47,14 @@
{
return getAssembler(Page.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return PageLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScheduledJobFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScheduledJobFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScheduledJobFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScheduledJobFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.ScheduledJob;
+import org.apache.turbine.modules.ScheduledJobLoader;
/**
* A screen factory that attempts to load a java class from
@@ -45,4 +47,14 @@
{
return getAssembler(ScheduledJob.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return ScheduledJobLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScreenFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScreenFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScreenFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/java/JavaScreenFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.Screen;
+import org.apache.turbine.modules.ScreenLoader;
/**
* A screen factory that attempts to load a java class from
@@ -45,4 +47,14 @@
{
return getAssembler(Screen.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return ScreenLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Action;
+import org.apache.turbine.modules.ActionLoader;
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
/**
* A screen factory that attempts to load a python class in the
@@ -49,4 +51,14 @@
{
return getAssembler(Action.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return ActionLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java Tue Feb 10 19:40:09 2009
@@ -31,6 +31,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
@@ -158,4 +159,22 @@
}
return assembler;
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public abstract Loader getLoader();
+
+ /**
+ * Get the size of a possibly configured cache
+ *
+ * @return the size of the cache in bytes
+ */
+ public int getCacheSize()
+
+ {
+ return getLoader().getCacheSize();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java Tue Feb 10 19:40:09 2009
@@ -23,6 +23,8 @@
import org.apache.turbine.modules.Assembler;
import org.apache.turbine.modules.Layout;
+import org.apache.turbine.modules.LayoutLoader;
+import org.apache.turbine.modules.Loader;
/**
* A screen factory that attempts to load a python class in the
@@ -49,4 +51,14 @@
{
return getAssembler(Layout.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return LayoutLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.Navigation;
+import org.apache.turbine.modules.NavigationLoader;
/**
* A screen factory that attempts to load a python class in the
@@ -49,4 +51,14 @@
{
return getAssembler(Navigation.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return NavigationLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.Page;
+import org.apache.turbine.modules.PageLoader;
/**
* A screen factory that attempts to load a python class in the
@@ -49,4 +51,14 @@
{
return getAssembler(Page.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return PageLoader.getInstance();
+ }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java?rev=743072&r1=743071&r2=743072&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java Tue Feb 10 19:40:09 2009
@@ -22,7 +22,9 @@
import org.apache.turbine.modules.Assembler;
+import org.apache.turbine.modules.Loader;
import org.apache.turbine.modules.Screen;
+import org.apache.turbine.modules.ScreenLoader;
/**
* A screen factory that attempts to load a python class in the
@@ -49,4 +51,14 @@
{
return getAssembler(Screen.PREFIX, name);
}
+
+ /**
+ * Get the loader for this type of assembler
+ *
+ * @return a Loader
+ */
+ public Loader getLoader()
+ {
+ return ScreenLoader.getInstance();
+ }
}