bloritsch 2003/10/22 11:18:37
Modified: src/samples/org/apache/cocoon/samples/parentcm
Generator.java ParentComponentManager.java
src/test/org/apache/cocoon/acting
RequestParamActionTestCase.xtest
ResourceExistsActionTestCase.xtest
src/test/org/apache/cocoon/generation
FileGeneratorTestCase.xtest
src/test/org/apache/cocoon/transformation
TraxTransformerTestCase.xtest
tools/lib junit.jar
Log:
Update the remaining tests,etc. to be resettable/serviceable
Revision Changes Path
1.3 +4 -3
cocoon-2.2/src/samples/org/apache/cocoon/samples/parentcm/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/samples/org/apache/cocoon/samples/parentcm/Generator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Generator.java 17 Oct 2003 17:49:24 -0000 1.2
+++ Generator.java 22 Oct 2003 18:18:36 -0000 1.3
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.samples.parentcm;
-import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
@@ -69,10 +68,12 @@
* Where <code><i>current time</i></code> is the current time as obtained
from the
* <code>Time</code> component.
*
+ * @TODO: POOLED
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
* @version CVS $Id$
*/
-public class Generator extends ServiceableGenerator implements Poolable {
+public class Generator extends ServiceableGenerator {
/**
* Current time.
1.2 +17 -17
cocoon-2.2/src/samples/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Index: ParentComponentManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/samples/org/apache/cocoon/samples/parentcm/ParentComponentManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParentComponentManager.java 9 Mar 2003 00:10:03 -0000 1.1
+++ ParentComponentManager.java 22 Oct 2003 18:18:37 -0000 1.2
@@ -50,16 +50,16 @@
*/
package org.apache.cocoon.samples.parentcm;
-import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.DefaultServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import javax.naming.Context;
import java.util.Hashtable;
@@ -72,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
* @version CVS $Id$
*/
-public class ParentComponentManager implements ComponentManager, LogEnabled,
Initializable {
+public class ParentComponentManager implements ServiceManager, LogEnabled,
Initializable {
/**
* Our logger.
@@ -88,17 +88,17 @@
* The delegate that will be configured and provide the
* functionality for this component manager.
*/
- private final ExcaliburComponentManager delegate;
+ private final ServiceManager delegate;
public ParentComponentManager(final String jndiName) {
this.jndiName = jndiName;
// Initialize it here so we can let it be final.
- this.delegate = new ExcaliburComponentManager();
+ this.delegate = new DefaultServiceManager();
}
- public boolean hasComponent(final String role) {
- return delegate.hasComponent(role);
+ public boolean hasService(final String role) {
+ return delegate.hasService(role);
}
/**
@@ -125,25 +125,25 @@
// We ignore the setRoleManager call, as ExcaliburComponentManager
handles that
// in configure().
- this.delegate.enableLogging(logger);
- this.delegate.contextualize(new DefaultContext());
- this.delegate.configure(config);
- this.delegate.initialize();
+ ContainerUtil.enableLogging(delegate, logger);
+ ContainerUtil.contextualize(delegate, new DefaultContext());
+ ContainerUtil.configure(delegate, config);
+ ContainerUtil.initialize(delegate);
this.logger.debug("Component manager successfully initialized.");
}
- public Component lookup(final String role) throws ComponentException {
+ public Object lookup(final String role) throws ServiceException {
return this.delegate.lookup(role);
}
- public void release(final Component component) {
+ public void release(final Object component) {
this.delegate.release(component);
}
/**
* Provide component with a logger.
- *
+ *
* @param logger the logger
*/
public void enableLogging(Logger logger) {
1.3 +1 -15
cocoon-2.2/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest
Index: RequestParamActionTestCase.xtest
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestParamActionTestCase.xtest 21 Sep 2003 15:40:24 -0000 1.2
+++ RequestParamActionTestCase.xtest 22 Oct 2003 18:18:37 -0000 1.3
@@ -25,20 +25,6 @@
<context/>
- <roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
- <role name="org.apache.cocoon.acting.ActionSelector"
- shorthand="actions"
-
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
- </roles>
-
<components>
<source-factories>
<component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
@@ -48,7 +34,7 @@
<source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<actions logger="test">
- <component-instance class="org.apache.cocoon.acting.RequestParamAction"
+ <component-instance class="org.apache.cocoon.acting.RequestParamAction"
name="request"/>
</actions>
</components>
1.3 +1 -15
cocoon-2.2/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.xtest
Index: ResourceExistsActionTestCase.xtest
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.xtest,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceExistsActionTestCase.xtest 21 Sep 2003 15:40:24 -0000
1.2
+++ ResourceExistsActionTestCase.xtest 22 Oct 2003 18:18:37 -0000
1.3
@@ -25,20 +25,6 @@
<context/>
- <roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
- <role name="org.apache.cocoon.acting.ActionSelector"
- shorthand="actions"
-
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
- </roles>
-
<components>
<source-factories>
<component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
@@ -48,7 +34,7 @@
<source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<actions logger="test">
- <component-instance class="org.apache.cocoon.acting.ResourceExistsAction"
+ <component-instance class="org.apache.cocoon.acting.ResourceExistsAction"
name="exist"/>
</actions>
</components>
1.7 +0 -18
cocoon-2.2/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
Index: FileGeneratorTestCase.xtest
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileGeneratorTestCase.xtest 21 Sep 2003 15:40:24 -0000 1.6
+++ FileGeneratorTestCase.xtest 22 Oct 2003 18:18:37 -0000 1.7
@@ -26,24 +26,6 @@
<context/>
- <roles>
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
-
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
- <role name="org.apache.cocoon.generation.GeneratorSelector"
- shorthand="generators"
-
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
- </roles>
-
<components>
<xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
<parameter name="validate" value="false"/>
1.4 +2 -36
cocoon-2.2/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
Index: TraxTransformerTestCase.xtest
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraxTransformerTestCase.xtest 21 Sep 2003 15:40:24 -0000 1.3
+++ TraxTransformerTestCase.xtest 22 Oct 2003 18:18:37 -0000 1.4
@@ -25,40 +25,6 @@
<context/>
- <roles>
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
-
- <role name="org.apache.excalibur.xmlizer.XMLizer"
- shorthand="xmlizer"
- default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
-
- <role name="org.apache.excalibur.xml.xslt.XSLTProcessor"
- shorthand="xslt-processor"
- default-class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"/>
-
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
- <role name="org.apache.cocoon.transformation.TransformerSelector"
- shorthand="transformers"
-
default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-
- <role name="org.apache.excalibur.store.Store/TransientStore"
- shorthand="transient-store"
- default-class="org.apache.excalibur.store.impl.MemoryStore"/>
-
- <role name="org.apache.excalibur.store.Store"
- shorthand="persistent-store"
- default-class="org.apache.excalibur.store.impl.MemoryStore"/>
- </roles>
-
<components>
<xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
<parameter name="validate" value="false"/>
@@ -103,7 +69,7 @@
</component-instance>
<transformers logger="test">
- <component-instance
class="org.apache.cocoon.transformation.TraxTransformer"
+ <component-instance
class="org.apache.cocoon.transformation.TraxTransformer"
name="xalan">
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
@@ -111,7 +77,7 @@
<xslt-processor-role>xalan</xslt-processor-role>
</component-instance>
- <component-instance name="xsltc"
+ <component-instance name="xsltc"
class="org.apache.cocoon.transformation.TraxTransformer">
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
1.2 +404 -424 cocoon-2.2/tools/lib/junit.jar
<<Binary file>>
