You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/01/30 12:15:52 UTC
cvs commit: avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl DefaultBlockLoader.java
mcconnell 2003/01/30 03:15:52
Modified: merlin/src/java/org/apache/avalon/merlin/block/impl
DefaultBlockLoader.java
Log:
Remove sourceresolver stuff until sourceresolver has a working test case.
Revision Changes Path
1.4 +1 -31 avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java
Index: DefaultBlockLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlockLoader.java 19 Jan 2003 18:18:50 -0000 1.3
+++ DefaultBlockLoader.java 30 Jan 2003 11:15:51 -0000 1.4
@@ -251,36 +251,6 @@
{
throw new IllegalStateException( "contextualization" );
}
-
- final SourceResolverImpl resolver = new SourceResolverImpl();
- resolver.enableLogging( getLogger() );
-
- final DefaultContext context = new DefaultContext();
- context.put( "context-root", m_home );
- resolver.contextualize( context );
-
- final ResourceSourceFactory factory = new ResourceSourceFactory();
- factory.enableLogging( getLogger() );
-
- final DefaultServiceSelector selector = new DefaultServiceSelector();
- selector.put( "resource", factory );
-
- final DefaultServiceManager manager = new DefaultServiceManager();
- manager.put( SourceFactory.ROLE + "Selector", selector );
-
- try
- {
- manager.lookup( SourceFactory.ROLE + "Selector" );
- }
- catch( Throwable e )
- {
- getLogger().error( "Rubbush", e );
- }
-
- resolver.service( manager );
- resolver.parameterize( new Parameters() );
-
- m_resolver = resolver;
}
//==============================================================
---------------------------------------------------------------------
To unsubscribe, e-mail: avalon-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: avalon-cvs-help@jakarta.apache.org