jvanzyl 01/06/27 11:53:57
Modified: src/java/org/apache/turbine/services/bsf
TurbineBSFService.java
src/java/org/apache/turbine/services/jsp/tags
NavigationTag.java ScreenTag.java
src/java/org/apache/turbine/services/jsp/util
JspNavigation.java JspScreenPlaceholder.java
src/java/org/apache/turbine/services/pull/util
UIManager.java
src/java/org/apache/turbine/services/schedule
WorkerThread.java
src/java/org/apache/turbine/services/template
TurbineTemplateService.java
src/java/org/apache/turbine/services/upload
BaseUploadService.java DefaultFileItem.java
TurbineUpload.java UploadService.java
src/java/org/apache/turbine/services/webmacro
TurbineWebMacroService.java
Removed: src/java/org/apache/turbine/services/assemblerbroker
AssemblerBrokerService.java
TurbineAssemblerBrokerService.java
src/java/org/apache/turbine/services/assemblerbroker/util
AssemblerFactory.java
src/java/org/apache/turbine/services/assemblerbroker/util/java
JavaActionFactory.java JavaBaseFactory.java
JavaLayoutFactory.java JavaNavigationFactory.java
JavaPageFactory.java JavaScheduledJobFactory.java
JavaScreenFactory.java
src/java/org/apache/turbine/services/assemblerbroker/util/python
PythonActionFactory.java PythonBaseFactory.java
PythonLayoutFactory.java
PythonNavigationFactory.java PythonPageFactory.java
PythonScreenFactory.java
src/java/org/apache/turbine/services/servlet
ServletService.java TurbineServlet.java
TurbineServletService.java
src/java/org/apache/turbine/services/uniqueid
TurbineUniqueId.java TurbineUniqueIdService.java
UniqueIdService.java
Log:
- the upload service no longer depends on the uniqueid service
- removed the uniqueid service as it's not really a service and
it was the last service that required the servlet service.
- the servlet service is now gone, all the info can be retrieved
from Turbine.java itself
- the assembler broker isn't used anymore and has been replaced
by the ModuleLoader which will allow the use of scripts via
the BSF.
Revision Changes Path
1.2 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/bsf/TurbineBSFService.java
Index: TurbineBSFService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/bsf/TurbineBSFService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineBSFService.java 2001/06/19 23:47:21 1.1
+++ TurbineBSFService.java 2001/06/27 18:53:41 1.2
@@ -142,7 +142,7 @@
script = getRealPath(scriptsDirectory + "/" + script);
- getCategory().debug("Script to execute: " + script);
+ getCategory().debug("[BSFService] Script to execute: " + script);
try
{
1.5 +5 -2
jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/NavigationTag.java
Index: NavigationTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/NavigationTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NavigationTag.java 2001/05/05 14:43:55 1.4
+++ NavigationTag.java 2001/06/27 18:53:42 1.5
@@ -58,7 +58,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.turbine.modules.NavigationLoader;
+//import org.apache.turbine.modules.NavigationLoader;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.template.TemplateService;
@@ -109,7 +110,9 @@
pageContext.getOut().flush();
module = ((TemplateService)TurbineServices.getInstance().getService(
TemplateService.SERVICE_NAME)).getNavigationName(template);
- NavigationLoader.getInstance().exec(data, module);
+
+ //NavigationLoader.getInstance().exec(data, module);
+ Turbine.getModuleLoader().getModule("navigation", module).execute(data);
}
catch (Exception e)
{
1.6 +6 -2
jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/ScreenTag.java
Index: ScreenTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/tags/ScreenTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScreenTag.java 2001/05/05 14:43:55 1.5
+++ ScreenTag.java 2001/06/27 18:53:42 1.6
@@ -58,7 +58,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.turbine.modules.ScreenLoader;
+//import org.apache.turbine.modules.ScreenLoader;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.template.TemplateService;
@@ -155,7 +156,10 @@
{
module = ((TemplateService)TurbineServices.getInstance().getService(
TemplateService.SERVICE_NAME)).getScreenName(template);
- ScreenLoader.getInstance().exec(data, module);
+
+ //ScreenLoader.getInstance().exec(data, module);
+ Turbine.getModuleLoader().getModule("screen", module).execute(data);
+
pageContext.setAttribute(FLAG,
Boolean.TRUE, PageContext.REQUEST_SCOPE);
}
1.4 +6 -2
jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java
Index: JspNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspNavigation.java 2001/05/05 14:43:56 1.3
+++ JspNavigation.java 2001/06/27 18:53:43 1.4
@@ -55,7 +55,8 @@
*/
import java.io.IOException;
-import org.apache.turbine.modules.NavigationLoader;
+//import org.apache.turbine.modules.NavigationLoader;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.util.Log;
@@ -104,7 +105,10 @@
{
module = ((TemplateService)TurbineServices.getInstance().getService(
TemplateService.SERVICE_NAME)).getNavigationName(template);
- NavigationLoader.getInstance().exec(data, module);
+
+ //NavigationLoader.getInstance().exec(data, module);
+ Turbine.getModuleLoader().getModule(
+ Turbine.NAVIGATIONS, module).execute(data);
}
catch (Exception e)
{
1.4 +7 -3
jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java
Index: JspScreenPlaceholder.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspScreenPlaceholder.java 2001/05/05 14:43:56 1.3
+++ JspScreenPlaceholder.java 2001/06/27 18:53:44 1.4
@@ -55,7 +55,8 @@
*/
import java.io.IOException;
-import org.apache.turbine.modules.ScreenLoader;
+//import org.apache.turbine.modules.ScreenLoader;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.util.Log;
@@ -71,7 +72,7 @@
* <%useBean id="screen_placeholder" class="JspScreenPlaceholder" scope="request"/%>
* ...
* <%= screen_placeholder %>
- *</code>
+ * </code>
*
* @author <a href="[EMAIL PROTECTED]">John D. McNally</a>
*/
@@ -104,7 +105,10 @@
template = data.getTemplateInfo().getScreenTemplate();
module = ((TemplateService)TurbineServices.getInstance().getService(
TemplateService.SERVICE_NAME)).getScreenName(template);
- ScreenLoader.getInstance().exec(data, module);
+
+ //ScreenLoader.getInstance().exec(data, module);
+ Turbine.getModuleLoader().getModule(
+ Turbine.SCREENS, module).execute(data);
}
catch (Exception e)
{
1.12 +10 -10
jakarta-turbine/src/java/org/apache/turbine/services/pull/util/UIManager.java
Index: UIManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/util/UIManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UIManager.java 2001/06/04 22:49:04 1.11
+++ UIManager.java 2001/06/27 18:53:45 1.12
@@ -59,13 +59,13 @@
import java.util.Hashtable;
import java.util.Properties;
+import org.apache.turbine.Turbine;
import org.apache.turbine.util.ContentURI;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.services.pull.TurbinePull;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.om.security.User;
@@ -105,7 +105,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.11 2001/06/04 22:49:04 jvanzyl Exp $
+ * @version $Id: UIManager.java,v 1.12 2001/06/27 18:53:45 jvanzyl Exp $
*/
public class UIManager implements ApplicationTool
{
@@ -281,12 +281,12 @@
{
StringBuffer sb = new StringBuffer();
- sb.append(TurbineServlet.getServerScheme()).
+ sb.append(Turbine.getServerScheme()).
append("://").
- append(TurbineServlet.getServerName()).
+ append(Turbine.getServerName()).
append(":").
- append(TurbineServlet.getServerPort()).
- append(TurbineServlet.getContextPath()).
+ append(Turbine.getServerPort()).
+ append(Turbine.getApplicationRoot()).
append("/").
append(resourcesDirectory).
append(SKINS_DIRECTORY).
@@ -338,12 +338,12 @@
{
StringBuffer sb = new StringBuffer();
- sb.append(TurbineServlet.getServerScheme()).
+ sb.append(Turbine.getServerScheme()).
append("://").
- append(TurbineServlet.getServerName()).
+ append(Turbine.getServerName()).
append(":").
- append(TurbineServlet.getServerPort()).
- append(TurbineServlet.getContextPath()).
+ append(Turbine.getServerPort()).
+ append(Turbine.getApplicationRoot()).
append("/").
append(resourcesDirectory).
append(SKINS_DIRECTORY).
1.21 +13 -15
jakarta-turbine/src/java/org/apache/turbine/services/schedule/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/WorkerThread.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WorkerThread.java 2001/06/14 14:43:18 1.20
+++ WorkerThread.java 2001/06/27 18:53:46 1.21
@@ -54,16 +54,15 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.modules.ScheduledJobLoader;
-import org.apache.turbine.util.Log;
+import org.apache.turbine.Turbine;
+import org.apache.turbine.modules.ScheduledJob;
/**
* Wrapper for a <code>JobEntry</code> to actually perform the job's action.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: WorkerThread.java,v 1.20 2001/06/14 14:43:18 jvanzyl Exp $
+ * @version $Id: WorkerThread.java,v 1.21 2001/06/27 18:53:46 jvanzyl Exp $
*/
public class WorkerThread
implements Runnable
@@ -76,7 +75,6 @@
/**
* The {@link org.apache.turbine.services.logging.Logger} facility to use.
*/
- //private Logger logger = null;
/**
* Creates a new worker to run the specified <code>JobEntry</code>.
@@ -86,11 +84,6 @@
public WorkerThread(JobEntry je)
{
this.je = je;
-
- /*
- logger = TurbineLogging.getLogger
- (TurbineConstants.SCHEDULER_LOG_FACILITY);
- */
}
/**
@@ -107,13 +100,17 @@
{
je.setActive(true);
logStateChange("started");
- ScheduledJobLoader.getInstance().exec(je, je.getTask());
+ ScheduledJob sc = (ScheduledJob) Turbine.getModuleLoader()
+ .getModule(Turbine.JOBS, je.getTask());
+
+ sc.execute(je);
}
}
catch (Exception e)
{
- Log.error("Error in WorkerThread for sheduled job #" +
- je.getPrimaryKey() + ", task: " + je.getTask(), e);
+ //!! use the service for logging
+ //Log.error("Error in WorkerThread for sheduled job #" +
+ // je.getPrimaryKey() + ", task: " + je.getTask(), e);
}
finally
{
@@ -132,7 +129,8 @@
*/
private final void logStateChange(String state)
{
- Log.debug("Scheduled job #" + je.getPrimaryKey() + ' ' + state +
- ", task: " + je.getTask());
+ //!! use the service to log.
+ //Log.debug("Scheduled job #" + je.getPrimaryKey() + ' ' + state +
+ // ", task: " + je.getTask());
}
}
1.46 +5 -11
jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- TurbineTemplateService.java 2001/06/14 14:44:01 1.45
+++ TurbineTemplateService.java 2001/06/27 18:53:49 1.46
@@ -55,16 +55,10 @@
*/
import java.io.File;
-
import java.util.HashMap;
import java.util.Hashtable;
-
-import org.apache.turbine.modules.ScreenLoader;
-import org.apache.turbine.modules.LayoutLoader;
-import org.apache.turbine.modules.NavigationLoader;
-
+import org.apache.turbine.Turbine;
import org.apache.turbine.util.RunData;
-
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
@@ -112,7 +106,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TurbineTemplateService.java,v 1.45 2001/06/14 14:44:01 jvanzyl Exp
$
+ * @version $Id: TurbineTemplateService.java,v 1.46 2001/06/27 18:53:49 jvanzyl Exp
$
*/
public class TurbineTemplateService
extends BaseService
@@ -653,15 +647,15 @@
switch (key)
{
case SCREEN_KEY:
- ScreenLoader.getInstance().getInstance(module);
+ Turbine.getModuleLoader().getModule(Turbine.SCREENS,module);
return module;
case LAYOUT_KEY:
- LayoutLoader.getInstance().getInstance(module);
+ Turbine.getModuleLoader().getModule(Turbine.LAYOUTS,module);
return module;
case NAVIGATION_KEY:
- NavigationLoader.getInstance().getInstance(module);
+
Turbine.getModuleLoader().getModule(Turbine.NAVIGATIONS,module);
return module;
}
}
1.5 +28 -1
jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java
Index: BaseUploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseUploadService.java 2001/06/25 04:55:46 1.4
+++ BaseUploadService.java 2001/06/27 18:53:53 1.5
@@ -68,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: BaseUploadService.java,v 1.4 2001/06/25 04:55:46 jvanzyl Exp $
+ * @version $Id: BaseUploadService.java,v 1.5 2001/06/27 18:53:53 jvanzyl Exp $
*/
public abstract class BaseUploadService
extends BaseService
@@ -80,6 +80,8 @@
*/
public static final int MAX_HEADER_SIZE = 1024;
+ protected static int counter;
+
/**
* Initializes the service.
*
@@ -99,6 +101,31 @@
"Upload Service: REPOSITORY_KEY => " + path);
setInit(true);
+ }
+
+ /**
+ * <p> Returns an identifier that is unique within this turbine
+ * instance, but does not have random-like apearance.
+ *
+ * @return A String with the non-random looking instance
+ * identifier.
+ */
+ public String getUniqueId()
+ {
+ int current;
+ synchronized(TurbineUploadService.class)
+ {
+ current = counter++;
+ }
+ String id = Integer.toString(current);
+
+ // If you manage to get more than 100 million of ids, you'll
+ // start getting ids longer than 8 characters.
+ if(current < 100000000)
+ {
+ id = ("00000000"+id).substring(id.length());
+ }
+ return id;
}
/**
1.2 +3 -6
jakarta-turbine/src/java/org/apache/turbine/services/upload/DefaultFileItem.java
Index: DefaultFileItem.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/DefaultFileItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFileItem.java 2001/06/25 04:56:38 1.1
+++ DefaultFileItem.java 2001/06/27 18:53:53 1.2
@@ -66,8 +66,6 @@
import java.io.OutputStream;
import javax.activation.DataSource;
-
-import org.apache.turbine.services.uniqueid.TurbineUniqueId;
import org.apache.turbine.services.upload.TurbineUpload;
/**
@@ -93,7 +91,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: DefaultFileItem.java,v 1.1 2001/06/25 04:56:38 jvanzyl Exp $
+ * @version $Id: DefaultFileItem.java,v 1.2 2001/06/27 18:53:53 jvanzyl Exp $
*/
public class DefaultFileItem implements FileItem
{
@@ -385,9 +383,8 @@
DefaultFileItem item = new DefaultFileItem(name, contentType);
if(requestSize > TurbineUpload.getSizeThreshold())
{
- String instanceName = TurbineUniqueId.getInstanceId();
- String fileName = TurbineUniqueId.getUniqueId();
- fileName = instanceName + "_upload_" + fileName + ".tmp";
+ String fileName = TurbineUpload.getUniqueId();
+ fileName = "upload_" + fileName + ".tmp";
fileName = path + "/" + fileName;
item.storeLocation = new File(fileName);
}
1.14 +6 -1
jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java
Index: TurbineUpload.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineUpload.java 2001/06/25 04:55:47 1.13
+++ TurbineUpload.java 2001/06/27 18:53:53 1.14
@@ -74,7 +74,7 @@
* the service's properties and default values for them.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineUpload.java,v 1.13 2001/06/25 04:55:47 jvanzyl Exp $
+ * @version $Id: TurbineUpload.java,v 1.14 2001/06/27 18:53:53 jvanzyl Exp $
*/
public abstract class TurbineUpload
{
@@ -196,5 +196,10 @@
throws TurbineException
{
return getService().parseRequest(req, path);
+ }
+
+ public static String getUniqueId()
+ {
+ return getService().getUniqueId();
}
}
1.14 +3 -1
jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java
Index: UploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UploadService.java 2001/06/25 04:55:49 1.13
+++ UploadService.java 2001/06/27 18:53:55 1.14
@@ -69,7 +69,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: UploadService.java,v 1.13 2001/06/25 04:55:49 jvanzyl Exp $
+ * @version $Id: UploadService.java,v 1.14 2001/06/27 18:53:55 jvanzyl Exp $
*/
public interface UploadService
extends Service
@@ -223,4 +223,6 @@
* @return The repository.
*/
public String getRepository();
+
+ public String getUniqueId();
}
1.39 +1 -2
jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java
Index: TurbineWebMacroService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TurbineWebMacroService.java 2001/06/14 14:45:52 1.38
+++ TurbineWebMacroService.java 2001/06/27 18:53:56 1.39
@@ -61,7 +61,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.services.template.BaseTemplateEngineService;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.ContentURI;
@@ -110,7 +109,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TurbineWebMacroService.java,v 1.38 2001/06/14 14:45:52 jvanzyl Exp
$
+ * @version $Id: TurbineWebMacroService.java,v 1.39 2001/06/27 18:53:56 jvanzyl Exp
$
*/
public class TurbineWebMacroService
extends BaseTemplateEngineService
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
