You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by cz...@apache.org on 2002/04/08 08:14:34 UTC
cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util ContextManager.java
cziegeler 02/04/07 23:14:33
Modified: all/src/scratchpad/org/apache/avalon/excalibur/i18n
XmlBundle.java
all/src/scratchpad/org/apache/avalon/excalibur/source
SourceResolver.java SourceResolverImpl.java
fortress/src/java/org/apache/excalibur/fortress/util
ContextManager.java
Log:
Renamed method to avoid naming conflicts with the (now) obsolete version of Cocoon
Revision Changes Path
1.10 +2 -2 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/XmlBundle.java
Index: XmlBundle.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/i18n/XmlBundle.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XmlBundle.java 16 Mar 2002 00:05:47 -0000 1.9
+++ XmlBundle.java 8 Apr 2002 06:14:33 -0000 1.10
@@ -35,7 +35,7 @@
* @author <a href="mailto:mengelhart@earthtrip.com">Mike Engelhart</a>
* @author <a href="mailto:neeme@apache.org">Neeme Praks</a>
* @author <a href="mailto:oleg@one.lv">Oleg Podolsky</a>
- * @version $Id: XmlBundle.java,v 1.9 2002/03/16 00:05:47 donaldp Exp $
+ * @version $Id: XmlBundle.java,v 1.10 2002/04/08 06:14:33 cziegeler Exp $
*/
public class XmlBundle extends AbstractBundle implements Configurable, Initializable, Disposable, Composable
{
@@ -118,7 +118,7 @@
public void initialize( String uri ) throws Exception
{
SourceResolver resolver = (SourceResolver)this.manager.lookup( SourceResolver.ROLE );
- initialize( resolver.resolve( uri ) );
+ initialize( resolver.resolveURI( uri ) );
this.manager.release( resolver );
}
1.14 +5 -5 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolver.java
Index: SourceResolver.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolver.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SourceResolver.java 21 Mar 2002 00:04:21 -0000 1.13
+++ SourceResolver.java 8 Apr 2002 06:14:33 -0000 1.14
@@ -30,7 +30,7 @@
* like Composable, Initializable, Disposable etc.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.13 $ $Date: 2002/03/21 00:04:21 $
+ * @version CVS $Revision: 1.14 $ $Date: 2002/04/08 06:14:33 $
*/
public interface SourceResolver
@@ -42,7 +42,7 @@
* Get a <code>Source</code> object.
* This is a shortcut for <code>resolve(location, null, null)</code>
*/
- Source resolve( String location )
+ Source resolveURI( String location )
throws MalformedURLException, IOException, ComponentException;
/**
@@ -56,9 +56,9 @@
* @param parameters - Additional parameters for the URI. The parameters
* are specific to the used protocol.
*/
- Source resolve( String location,
- String base,
- Map parameters )
+ Source resolveURI( String location,
+ String base,
+ Map parameters )
throws MalformedURLException, IOException, ComponentException;
/**
1.26 +6 -6 jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolverImpl.java
Index: SourceResolverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolverImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SourceResolverImpl.java 4 Apr 2002 15:00:20 -0000 1.25
+++ SourceResolverImpl.java 8 Apr 2002 06:14:33 -0000 1.26
@@ -47,7 +47,7 @@
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version $Id: SourceResolverImpl.java,v 1.25 2002/04/04 15:00:20 bloritsch Exp $
+ * @version $Id: SourceResolverImpl.java,v 1.26 2002/04/08 06:14:33 cziegeler Exp $
*/
public class SourceResolverImpl
extends AbstractLogEnabled
@@ -134,18 +134,18 @@
/**
* Get a <code>Source</code> object.
*/
- public Source resolve( String location )
+ public Source resolveURI( 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( String location,
- String baseURI,
- Map parameters )
+ public Source resolveURI( String location,
+ String baseURI,
+ Map parameters )
throws MalformedURLException, IOException, ComponentException
{
if( this.getLogger().isDebugEnabled() )
1.14 +2 -2 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ContextManager.java 4 Apr 2002 16:04:28 -0000 1.13
+++ ContextManager.java 8 Apr 2002 06:14:33 -0000 1.14
@@ -60,7 +60,7 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
- * @version CVS $Revision: 1.13 $ $Date: 2002/04/04 16:04:28 $
+ * @version CVS $Revision: 1.14 $ $Date: 2002/04/08 06:14:33 $
* @since 4.1
*/
public class ContextManager implements ContextManagerConstants
@@ -429,7 +429,7 @@
try
{
resolver = (SourceResolver)manager.lookup( SourceResolver.ROLE );
- src = resolver.resolve( configUri );
+ src = resolver.resolveURI( configUri );
return configBuilder.build( src.getInputStream() );
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>