Author: cziegeler
Date: Thu Nov 11 01:14:18 2004
New Revision: 57424
Removed:
cocoon/branches/BRANCH_2_1_X/legal/excalibur-event-api-1.1.jar.license.txt
cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-event-api-1.1.jar
Modified:
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Log:
Remove excalibur event stuff - unfortunately we can't remove event-impl as the
Axis block requires it
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Thu Nov 11 01:14:18 2004
@@ -76,17 +76,6 @@
event based programming.
</description>
<used-by>Cocoon Flow</used-by>
- <lib>core/excalibur-event-api-1.1.jar</lib>
- <homepage>http://excalibur.apache.org/</homepage>
- </file>
- <file>
- <title>Excalibur Event</title>
- <description>
- This is the Excalibur Event package which includes event queues,
- asynchronous command processing, and the interfaces to support
- event based programming.
- </description>
- <used-by>Cocoon Flow</used-by>
<lib>core/excalibur-event-impl-1.1.jar</lib>
<homepage>http://excalibur.apache.org/</homepage>
</file>
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java Thu Nov
11 01:14:18 2004
@@ -45,7 +45,6 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.CocoonComponentManager;
@@ -60,10 +59,6 @@
import org.apache.cocoon.util.ClassUtils;
import org.apache.commons.lang.SystemUtils;
-import org.apache.excalibur.event.Queue;
-import org.apache.excalibur.event.command.CommandManager;
-import org.apache.excalibur.event.command.TPCThreadManager;
-import org.apache.excalibur.event.command.ThreadManager;
import org.apache.excalibur.instrument.InstrumentManageable;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.source.Source;
@@ -95,10 +90,6 @@
InstrumentManageable {
static Cocoon instance;
- private ThreadManager threads;
-
- private CommandManager commands;
-
/** The application context */
private Context context;
@@ -175,32 +166,7 @@
public void contextualize(Context context) throws ContextException {
if (this.context == null) {
this.context = new ComponentContext(context);
-
- try {
- DefaultContext setup = (DefaultContext) this.context;
- this.threads = new TPCThreadManager();
-
- Parameters params = new Parameters();
- params.setParameter("threads-per-processor", "1");
- params.setParameter("sleep-time", "100");
- params.setParameter("block-timeout", "1000");
- params.setParameter("force-shutdown", "true");
- params.makeReadOnly();
-
- ContainerUtil.enableLogging(this.threads,
getLogger().getChildLogger("thread.manager"));
- ContainerUtil.parameterize(this.threads, params);
- ContainerUtil.initialize(this.threads);
-
- this.commands = new CommandManager();
- ContainerUtil.enableLogging(this.commands,
getLogger().getChildLogger("thread.manager"));
- this.threads.register(this.commands);
-
- setup.put(Queue.ROLE, this.commands.getCommandSink());
-
- setup.makeReadOnly();
- } catch (Exception e) {
- getLogger().error("Could not set up the Command Manager", e);
- }
+ ((DefaultContext) this.context).makeReadOnly();
this.classpath = (String)context.get(Constants.CONTEXT_CLASSPATH);
this.workDir = (File)context.get(Constants.CONTEXT_WORK_DIR);
@@ -487,14 +453,6 @@
* Dispose this instance
*/
public void dispose() {
- if (this.commands != null && this.threads != null) {
- this.threads.deregister(this.commands);
- }
- ContainerUtil.dispose(this.commands);
- this.commands = null;
- ContainerUtil.dispose(this.threads);
- this.threads = null;
-
if (this.componentManager != null) {
if (this.requestListener != null) {
this.componentManager.release(this.requestListener);
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Thu Nov 11 01:14:18 2004
@@ -18,9 +18,6 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -28,9 +25,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.thread.RunnableManager;
-import org.apache.excalibur.event.Queue;
-import org.apache.excalibur.event.Sink;
-import org.apache.excalibur.event.command.RepeatedCommand;
import org.apache.excalibur.instrument.CounterInstrument;
import org.apache.excalibur.instrument.Instrument;
import org.apache.excalibur.instrument.Instrumentable;
