cziegeler 02/04/02 05:13:07
Modified: src/java/org/apache/cocoon Cocoon.java
src/java/org/apache/cocoon/components
CocoonComponentManager.java
Added: lib/core avalon-excalibur-20020402.jar
avalon-excalibur-scratchpad-20020402.jar
Removed: lib/core avalon-excalibur-4.1.jar
avalon-excalibur-scratchpad-20020212.jar
Log:
Installed new source resolving - first try
Revision Changes Path
1.1 xml-cocoon2/lib/core/avalon-excalibur-20020402.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/avalon-excalibur-scratchpad-20020402.jar
<<Binary file>>
1.21 +4 -3 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Cocoon.java 26 Feb 2002 16:30:16 -0000 1.20
+++ Cocoon.java 2 Apr 2002 13:13:06 -0000 1.21
@@ -68,6 +68,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.components.pipeline.EventPipeline;
@@ -98,7 +99,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Id: Cocoon.java,v 1.20 2002/02/26 16:30:16 dims Exp $
+ * @version CVS $Id: Cocoon.java,v 1.21 2002/04/02 13:13:06 cziegeler Exp $
*/
public class Cocoon
extends AbstractLoggable
@@ -211,9 +212,9 @@
*/
public void initialize() throws Exception {
if (parentComponentManager != null) {
- this.componentManager = new
ExcaliburComponentManager(parentComponentManager,(ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
+ this.componentManager = new
CocoonComponentManager(parentComponentManager,(ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
} else {
- this.componentManager = new
ExcaliburComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
+ this.componentManager = new
CocoonComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
}
this.componentManager.setLogger(getLogger().getChildLogger("manager"));
this.componentManager.contextualize(this.context);
1.12 +2 -19
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CocoonComponentManager.java 15 Mar 2002 13:39:51 -0000 1.11
+++ CocoonComponentManager.java 2 Apr 2002 13:13:07 -0000 1.12
@@ -62,11 +62,9 @@
import org.apache.avalon.framework.component.Recomposable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
-/* The new source resolving (will go online after 2.0.2)
import java.net.MalformedURLException;
import org.apache.avalon.excalibur.source.Source;
import org.apache.avalon.excalibur.source.SourceResolver;
-*/
import org.xml.sax.SAXException;
@@ -77,21 +75,17 @@
* and by handling the lookup of the <code>SourceResolver</code> (in development)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CocoonComponentManager.java,v 1.11 2002/03/15 13:39:51
cziegeler Exp $
+ * @version CVS $Id: CocoonComponentManager.java,v 1.12 2002/04/02 13:13:07
cziegeler Exp $
*/
public final class CocoonComponentManager
extends ExcaliburComponentManager
-/* The new source resolving (will go online after 2.0.2)
implements SourceResolver
-*/
{
/** The environment information */
private static InheritableThreadLocal environmentStack = new
InheritableThreadLocal();
/** The configured <code>SourceResolver</code> */
- /* The new source resolving (will go online after 2.0.2)
private SourceResolver sourceResolver;
- */
/** Create the ComponentManager */
public CocoonComponentManager()
@@ -164,14 +158,13 @@
*/
public Component lookup( final String role )
throws ComponentException {
- /* The new source resolving (will go online after 2.0.2)
if ( role.equals(SourceResolver.ROLE) ) {
if ( null == this.sourceResolver ) {
this.sourceResolver = (SourceResolver) super.lookup( role );
}
return this;
}
- */
+
final Stack stack = (Stack)environmentStack.get();
if ( null != stack && !stack.empty()) {
final Object[] objects = (Object[])stack.peek();
@@ -218,18 +211,15 @@
if ( component instanceof RequestLifecycleComponent) {
return;
}
- /* The new source resolving (will go online after 2.0.2)
if ( component == this ) {
return;
}
- */
super.release( component);
}
/**
* Dispose
*/
- /* The new source resolving (will go online after 2.0.2)
public void dispose() {
if ( null != this.sourceResolver ) {
super.release( this.sourceResolver );
@@ -237,7 +227,6 @@
}
super.dispose();
}
- */
/**
* Release a RequestLifecycleComponent
@@ -249,17 +238,14 @@
/**
* Get a <code>Source</code> object.
*/
- /* The new source resolving (will go online after 2.0.2)
public Source resolve(final String location)
throws MalformedURLException, IOException, ComponentException {
return this.resolve(location, null, null);
}
- */
/**
* Get a <code>Source</code> object.
*/
- /* The new source resolving (will go online after 2.0.2)
public Source resolve(final String location,
String baseURI,
final Map parameters)
@@ -273,14 +259,11 @@
}
return this.sourceResolver.resolve(location, baseURI, parameters);
}
- */
/**
* Releases a resolved resource
*/
- /* The new source resolving (will go online after 2.0.2)
public void release( final Source source ) {
this.sourceResolver.release( source );
}
- */
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
