Author: cziegeler Date: Fri Jan 14 01:05:24 2005 New Revision: 125152 URL: http://svn.apache.org/viewcvs?view=rev&rev=125152 Log: Move all handlers into own package Added: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/LazyHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java Removed: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java Modified: cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
Modified: cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java?view=diff&rev=125152&p1=cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java&r1=125151&p2=cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java&r2=125152 ============================================================================== --- cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java (original) +++ cocoon/trunk/src/blocks/python/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java Fri Jan 14 01:05:24 2005 @@ -23,8 +23,8 @@ import org.apache.cocoon.components.language.programming.Program; import org.apache.cocoon.components.language.generator.CompiledComponent; -import org.apache.cocoon.core.container.AbstractComponentHandler; -import org.apache.cocoon.core.container.ComponentHandler; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; import java.io.File; import java.util.Collection; Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java?view=diff&rev=125152&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java&r1=125151&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java&r2=125152 ============================================================================== --- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java (original) +++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java Fri Jan 14 01:05:24 2005 @@ -27,8 +27,8 @@ import org.apache.cocoon.components.sax.XMLByteStreamCompiler; import org.apache.cocoon.components.sax.XMLByteStreamFragment; -import org.apache.cocoon.core.container.AbstractComponentHandler; -import org.apache.cocoon.core.container.ComponentHandler; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java?view=diff&rev=125152&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java&r1=125151&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java&r2=125152 ============================================================================== --- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java (original) +++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java Fri Jan 14 01:05:24 2005 @@ -33,8 +33,8 @@ import org.apache.cocoon.Constants; import org.apache.cocoon.components.classloader.ClassLoaderManager; import org.apache.cocoon.components.language.programming.Program; -import org.apache.cocoon.core.container.AbstractComponentHandler; -import org.apache.cocoon.core.container.ComponentHandler; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; /** * This interface is the common base of all Compiled Components. This Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java?view=diff&rev=125152&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java&r1=125151&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java&r2=125152 ============================================================================== --- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java (original) +++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/Program.java Fri Jan 14 01:05:24 2005 @@ -19,7 +19,7 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.cocoon.components.language.generator.CompiledComponent; -import org.apache.cocoon.core.container.ComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; /** * This interface states the functionality of a program. Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java?view=diff&rev=125152&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java&r1=125151&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java&r2=125152 ============================================================================== --- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java (original) +++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java Fri Jan 14 01:05:24 2005 @@ -22,8 +22,8 @@ import org.apache.cocoon.components.language.generator.CompiledComponent; import org.apache.cocoon.components.language.programming.Program; -import org.apache.cocoon.core.container.AbstractComponentHandler; -import org.apache.cocoon.core.container.ComponentHandler; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; /** * This represents program in Java language. Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java?view=diff&rev=125152&p1=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java&r1=125151&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java&r2=125152 ============================================================================== --- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java (original) +++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java Fri Jan 14 01:05:24 2005 @@ -23,8 +23,8 @@ import org.apache.cocoon.components.language.generator.CompiledComponent; import org.apache.cocoon.components.language.programming.Program; -import org.apache.cocoon.core.container.AbstractComponentHandler; -import org.apache.cocoon.core.container.ComponentHandler; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; import java.io.File; import java.util.Collection; Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java?view=auto&rev=125151 ============================================================================== Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java?view=auto&rev=125151 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java&r1=125151&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java Fri Jan 14 01:05:24 2005 @@ -32,6 +32,8 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; /** * Base class for all service managers: ServiceManager and ServiceSelector Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java?view=auto&rev=125151 ============================================================================== Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java?view=auto&rev=125151 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r1=125151&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Fri Jan 14 01:05:24 2005 @@ -43,6 +43,11 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.handler.AbstractComponentHandler; +import org.apache.cocoon.core.container.handler.AliasComponentHandler; +import org.apache.cocoon.core.container.handler.ComponentHandler; +import org.apache.cocoon.core.container.handler.InstanceComponentHandler; +import org.apache.cocoon.core.container.handler.LazyHandler; import org.apache.cocoon.core.source.SimpleSourceResolver; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java?view=auto&rev=125151 ============================================================================== Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java?view=auto&rev=125151 ============================================================================== Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java?view=auto&rev=125151 ============================================================================== Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java?view=auto&rev=125151 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r1=125151&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Fri Jan 14 01:05:24 2005 @@ -29,6 +29,7 @@ import org.apache.avalon.framework.service.ServiceSelector; import org.apache.avalon.framework.service.Serviceable; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.handler.ComponentHandler; /** * Default component selector for Cocoon's components. Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java?view=auto&rev=125151 ============================================================================== Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.component.Composable; @@ -25,6 +25,10 @@ import org.apache.avalon.framework.thread.SingleThreaded; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.ComponentEnvironment; +import org.apache.cocoon.core.container.ComponentFactory; +import org.apache.cocoon.core.container.DefaultServiceSelector; +import org.apache.cocoon.core.container.StandaloneServiceSelector; /** * This class acts like a Factory to instantiate the correct version Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractFactoryHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractFactoryHandler.java Fri Jan 14 01:05:24 2005 @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.ComponentFactory; /** * This class acts like a Factory to instantiate the correct version Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AliasComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AliasComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.CoreServiceManager; /** * A component handler used to alias roles: it delegates all its calls to another Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.cocoon.components.ComponentInfo; Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/InstanceComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/InstanceComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.CoreServiceManager; /** * A component handler for instances created outside the container. Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/LazyHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/LazyHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/LazyHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/LazyHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/LazyHandler.java Fri Jan 14 01:05:24 2005 @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.framework.CascadingRuntimeException; import org.apache.avalon.framework.configuration.Configuration; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.ComponentEnvironment; /** * Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/PoolableComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import java.util.Iterator; import java.util.LinkedList; @@ -22,6 +22,7 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.ComponentFactory; /** * The PoolableComponentHandler to make sure that poolable components are initialized Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/SingleThreadedComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/SingleThreadedComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.ComponentFactory; /** * The DefaultComponentHandler to make sure components are initialized Copied: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java?view=diff&rev=125152&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java&r2=125152 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ThreadSafeComponentHandler.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/ThreadSafeComponentHandler.java Fri Jan 14 01:05:24 2005 @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.core.container.handler; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.core.container.ComponentFactory; /** * The ThreadSafeComponentHandler to make sure components are initialized
