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/04/30 04:03:41 UTC
cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl StandardBlock.xinfo StandardBlockLoader.java
mcconnell 2003/04/29 19:03:41
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
DefaultApplianceFactory.java
merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
EngineClassLoader.java
merlin/assembly/src/test/org/apache/avalon/assembly/engine
ApplianceTestCase.java EngineTestCase.java
FactoryTestCase.java
merlin/assembly/src/test/org/apache/avalon/playground/factory
CustomAppliance.xinfo CustomApplianceFactory.xinfo
merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
StandardBlock.xinfo StandardBlockLoader.java
Log:
Updated to user PoolManager.ROLE as distinct from a urn reference.
Revision Changes Path
1.6 +16 -15 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceFactory.java
Index: DefaultApplianceFactory.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultApplianceFactory.java 29 Apr 2003 23:35:24 -0000 1.5
+++ DefaultApplianceFactory.java 30 Apr 2003 02:03:41 -0000 1.6
@@ -169,11 +169,13 @@
try
{
- Type type = loader.getRepository().getTypeRepository().getType( classname );
+ Type type =
+ loader.getRepository().getTypeRepository().getType( classname );
Profile profile =
loader.getRepository().getProfileRepository().getProfile( type );
- DefaultApplianceContext context = new DefaultApplianceContext( profile );
+ DefaultApplianceContext context =
+ new DefaultApplianceContext( profile );
context.put( ApplianceRepository.KEY, repository );
context.put( LoggingManager.KEY, logging );
context.makeReadOnly();
@@ -287,7 +289,7 @@
{
m_system = context;
m_repository = (ApplianceRepository) context.get( ApplianceRepository.KEY );
- m_pool = (PoolManager) context.get( "urn:assembly:threads.manager" );
+ m_pool = (PoolManager) context.get( PoolManager.ROLE );
m_logging = (LoggingManager) context.get( LoggingManager.KEY );
}
@@ -348,7 +350,7 @@
locator.put( ApplianceContext.KEY, context );
locator.put( "urn:assembly:engine", engine );
locator.put( "urn:assembly:appliance.system", system );
- locator.put( "urn:assembly:threads.manager", m_pool );
+ locator.put( PoolManager.ROLE, m_pool );
locator.makeReadOnly();
}
catch( Throwable e )
@@ -391,22 +393,21 @@
try
{
Map map = context.getDeploymentMap();
- Type type = engine.getRepository()
- .getTypeRepository().getType( classname );
+
+ Type type =
+ engine.getRepository().getTypeRepository().getType( classname );
+
Profile profile =
- engine.getRepository().getProfileRepository()
- .getProfile( type );
- DefaultApplianceContext cntx =
- new DefaultApplianceContext( profile, map );
+ engine.getRepository().getProfileRepository().getProfile( type );
- cntx.put( "urn:assembly:engine", engine );
+ DefaultApplianceContext cntx =
+ new DefaultApplianceContext( profile, map );
cntx.put( LifestyleService.KEY, lifestyle );
cntx.put( ApplianceContext.KEY, context );
cntx.put( ApplianceRepository.KEY, m_repository );
-
+ cntx.put( PoolManager.ROLE, m_pool );
cntx.put( "urn:assembly:appliance.system", system );
- cntx.put( "urn:assembly:threads.manager", m_pool );
-
+ cntx.put( "urn:assembly:engine", engine );
cntx.makeReadOnly();
Appliance appliance = engine.createAppliance( cntx, false );
1.4 +6 -6 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java
Index: EngineClassLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EngineClassLoader.java 29 Apr 2003 23:35:24 -0000 1.3
+++ EngineClassLoader.java 30 Apr 2003 02:03:41 -0000 1.4
@@ -376,10 +376,10 @@
m_manager = new DefaultApplianceRepository();
}
- if( context.hasEntry( "urn:assembly:threads.manager" ) )
+ if( context.hasEntry( PoolManager.ROLE ) )
{
m_pool = (PoolManager)
- context.get( "urn:assembly:threads.manager" );
+ context.get( PoolManager.ROLE );
} else
{
try
@@ -387,7 +387,7 @@
m_pool = getPoolManager();
} catch( IllegalStateException ise )
{
- throw new ContextException( "urn:assembly:threads.manager" );
+ throw new ContextException( PoolManager.ROLE );
}
}
}
@@ -711,7 +711,7 @@
context.put( LoggingManager.KEY, m_logging );
context.put( "urn:assembly:home", m_home );
context.put( "urn:assembly:engine.bootstrap", "false" );
- context.put( "urn:assembly:threads.manager", m_pool );
+ context.put( PoolManager.ROLE, m_pool );
if( m_root != null )
{
@@ -1194,7 +1194,7 @@
}
context.put( LoggingManager.KEY, getLoggingManager() );
- context.put( "urn:assembly:threads.manager", getPoolManager() );
+ context.put( PoolManager.ROLE, getPoolManager() );
m_system = context;
return m_system;
}
1.9 +1 -1 avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java
Index: ApplianceTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplianceTestCase.java 29 Apr 2003 14:39:44 -0000 1.8
+++ ApplianceTestCase.java 30 Apr 2003 02:03:41 -0000 1.9
@@ -134,7 +134,7 @@
DefaultLocator context = new DefaultLocator();
context.put( "urn:assembly:engine.bootstrap", "" + bootstrap );
context.put( LoggingManager.KEY, m_logManager );
- context.put( "urn:assembly:threads.manager", getPoolManager() );
+ context.put( PoolManager.ROLE, getPoolManager() );
context.makeReadOnly();
engine.contextualize( context );
engine.initialize();
1.8 +1 -1 avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java
Index: EngineTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EngineTestCase.java 29 Apr 2003 14:22:19 -0000 1.7
+++ EngineTestCase.java 30 Apr 2003 02:03:41 -0000 1.8
@@ -273,7 +273,7 @@
DefaultLocator context = new DefaultLocator();
context.put( LoggingManager.KEY, m_logManager );
context.put( "urn:assembly:engine.bootstrap", "" + bootstrap );
- context.put( "urn:assembly:threads.manager", getPoolManager() );
+ context.put( PoolManager.ROLE, getPoolManager() );
context.makeReadOnly();
engine.contextualize( context );
engine.initialize();
1.8 +1 -1 avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java
Index: FactoryTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FactoryTestCase.java 29 Apr 2003 14:22:19 -0000 1.7
+++ FactoryTestCase.java 30 Apr 2003 02:03:41 -0000 1.8
@@ -144,7 +144,7 @@
DefaultLocator context = new DefaultLocator();
context.put( LoggingManager.KEY, m_logManager );
context.put( "urn:assembly:engine.bootstrap", "" + bootstrap );
- context.put( "urn:assembly:threads.manager", getPoolManager() );
+ context.put( PoolManager.ROLE, getPoolManager() );
context.makeReadOnly();
engine.contextualize( context );
engine.initialize();
1.3 +1 -1 avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo
Index: CustomAppliance.xinfo
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CustomAppliance.xinfo 26 Apr 2003 12:37:48 -0000 1.2
+++ CustomAppliance.xinfo 30 Apr 2003 02:03:41 -0000 1.3
@@ -51,7 +51,7 @@
key="urn:assembly:appliance.repository"
type="org.apache.avalon.assembly.appliance.ApplianceRepository"/>
<entry
- key="urn:assembly:threads.manager"
+ key="org.apache.excalibur.mpool.PoolManager"
type="org.apache.excalibur.mpool.PoolManager"/>
</context>
1.2 +1 -1 avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomApplianceFactory.xinfo
Index: CustomApplianceFactory.xinfo
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomApplianceFactory.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CustomApplianceFactory.xinfo 13 Mar 2003 01:04:30 -0000 1.1
+++ CustomApplianceFactory.xinfo 30 Apr 2003 02:03:41 -0000 1.2
@@ -42,7 +42,7 @@
key="urn:assembly:logging"
type="org.apache.avalon.assembly.logging.LoggingManager"/>
<entry
- key="urn:assembly:threads.manager"
+ key="org.apache.excalibur.mpool.PoolManager"
type="org.apache.excalibur.mpool.PoolManager"/>
</context>
1.4 +1 -1 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.xinfo
Index: StandardBlock.xinfo
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StandardBlock.xinfo 26 Apr 2003 12:37:48 -0000 1.3
+++ StandardBlock.xinfo 30 Apr 2003 02:03:41 -0000 1.4
@@ -25,7 +25,7 @@
type="org.apache.avalon.assembly.engine.impl.EngineClassLoader"/>
<entry key="urn:assembly:lifestyle.service"
type="org.apache.avalon.assembly.lifestyle.LifestyleService"/>
- <entry key="urn:assembly:threads.manager"
+ <entry key="org.apache.excalibur.mpool.PoolManager"
type="org.apache.excalibur.mpool.PoolManager"/>
<entry key="urn:assembly:appliance.system"
type="org.apache.avalon.assembly.locator.Locator"/>
1.7 +2 -2 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java
Index: StandardBlockLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardBlockLoader.java 29 Apr 2003 21:07:36 -0000 1.6
+++ StandardBlockLoader.java 30 Apr 2003 02:03:41 -0000 1.7
@@ -403,11 +403,11 @@
DefaultLocator context = new DefaultLocator();
context.put( LoggingManager.KEY, m_logging );
context.put( Repository.KEY, m_repository );
+ context.put( PoolManager.ROLE, m_pool );
context.put( "urn:merlin:domain", m_domain );
context.put( "urn:assembly:home", m_home );
context.put( "urn:assembly:system", m_root );
context.put( "urn:assembly:engine.bootstrap", "true" );
- context.put( "urn:assembly:threads.manager", m_pool );
if( lib != null )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org