cziegeler 2004/06/04 04:08:09
Modified: src/blocks/cron/java/org/apache/cocoon/environment/background
BackgroundEnvironment.java
src/blocks/cron/java/org/apache/cocoon/components/cron
QuartzJobExecutor.java
Log:
Remove unused manager
Revision Changes Path
1.7 +10 -19
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
Index: BackgroundEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BackgroundEnvironment.java 26 May 2004 01:31:06 -0000 1.6
+++ BackgroundEnvironment.java 4 Jun 2004 11:08:08 -0000 1.7
@@ -22,10 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.Processor;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Context;
@@ -49,15 +46,11 @@
*/
public class BackgroundEnvironment extends AbstractEnvironment {
- private ComponentManager manager;
-
- public BackgroundEnvironment(Logger logger, Context ctx, ServiceManager
manager) {
+ public BackgroundEnvironment(Logger logger, Context ctx) {
super("", null, null);
this.enableLogging(logger);
- this.manager = new WrapperComponentManager(manager);
-
this.outputStream = new NullOutputStream();
// TODO Would special Background*-objects have advantages?
@@ -76,12 +69,7 @@
this.objectModel.put(ObjectModelHelper.CONTEXT_OBJECT, ctx);
}
- /** Needed by CocoonComponentManager.enterEnvironment */
- public ComponentManager getManager() {
- return this.manager;
- }
-
- /** Needed by CocoonComponentManager.enterEnvironment */
+ /** Needed by EnvironmentHelper.enterEnvironment */
public Processor getProcessor() {
return NullProcessor.INSTANCE;
}
@@ -91,13 +79,16 @@
* @param view
* @param context
* @param stream
- * @param log
+ * @param logger
*/
- public BackgroundEnvironment(String uri, String view, File context,
OutputStream stream, Logger log)
- {
+ public BackgroundEnvironment(String uri,
+ String view,
+ File context,
+ OutputStream stream,
+ Logger logger) {
super(uri, view);
- this.enableLogging(log);
+ this.enableLogging(logger);
this.outputStream = stream;
// TODO Would special Background*-objects have advantages?
1.9 +2 -2
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java
Index: QuartzJobExecutor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- QuartzJobExecutor.java 25 May 2004 07:28:24 -0000 1.8
+++ QuartzJobExecutor.java 4 Jun 2004 11:08:08 -0000 1.9
@@ -81,7 +81,7 @@
org.apache.cocoon.environment.Context envContext =
(org.apache.cocoon.environment.Context)data.get(QuartzJobScheduler.DATA_MAP_ENV_CONTEXT);
BackgroundEnvironment env;
- env = new BackgroundEnvironment(logger, envContext, manager);
+ env = new BackgroundEnvironment(logger, envContext);
boolean release = false;
try {
EnvironmentHelper.enterProcessor(env.getProcessor(), manager,
env);
