cziegeler 02/04/08 00:57:06
Modified: src/java/org/apache/cocoon/components
CocoonComponentManager.java
Added: lib/core avalon-scratchpad-scratchpad-20020408.jar
Removed: lib/core avalon-excalibur-scratchpad-20020402.jar
Log:
Updated to latest excalibur scratchpad
Revision Changes Path
1.1 xml-cocoon2/lib/core/avalon-scratchpad-scratchpad-20020408.jar
<<Binary file>>
1.13 +7 -7
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CocoonComponentManager.java 2 Apr 2002 13:13:07 -0000 1.12
+++ CocoonComponentManager.java 8 Apr 2002 07:57:06 -0000 1.13
@@ -75,7 +75,7 @@
* 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.12 2002/04/02 13:13:07
cziegeler Exp $
+ * @version CVS $Id: CocoonComponentManager.java,v 1.13 2002/04/08 07:57:06
cziegeler Exp $
*/
public final class CocoonComponentManager
extends ExcaliburComponentManager
@@ -238,17 +238,17 @@
/**
* Get a <code>Source</code> object.
*/
- public Source resolve(final String location)
+ public Source resolveURI(final String location)
throws MalformedURLException, IOException, ComponentException {
- return this.resolve(location, null, null);
+ return this.resolveURI(location, null, null);
}
/**
* Get a <code>Source</code> object.
*/
- public Source resolve(final String location,
- String baseURI,
- final Map parameters)
+ public Source resolveURI(final String location,
+ String baseURI,
+ final Map parameters)
throws MalformedURLException, IOException, ComponentException {
if (baseURI == null) {
final Stack stack = (Stack)environmentStack.get();
@@ -257,7 +257,7 @@
baseURI = ((Environment)objects[0]).getContext().toExternalForm();
}
}
- return this.sourceResolver.resolve(location, baseURI, parameters);
+ return this.sourceResolver.resolveURI(location, baseURI, parameters);
}
/**
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
