mcconnell 2002/08/12 21:45:56
Modified: assembly/src/java/org/apache/excalibur/merlin/assembly
ContainerManager.java
Log:
no message
Revision Changes Path
1.16 +1 -59
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContainerManager.java 13 Aug 2002 03:57:56 -0000 1.15
+++ ContainerManager.java 13 Aug 2002 04:45:56 -0000 1.16
@@ -814,64 +814,6 @@
"Unexpected error while attempting to prepare a lifestyle handler.";
throw new ResourceException( error, e );
}
-
-/*
- LifestyleHandler handler;
-
- String policy =
profile.getType().getInfo().getAttribute("avalon:lifestyle", "threadsafe" );
- if( policy.equals( "transient" ) )
- {
- handler = new TransientLifestyleHandler(
- this, m_provider, m_helper, profile, context );
- }
- else if( policy.equalsIgnoreCase( "threadsafe" ) )
- {
- handler = new SingletonLifestyleHandler(
- this, m_provider, m_helper, profile, context );
- }
- else if( policy.equalsIgnoreCase( "per-thread" ) )
- {
- final String error =
- "PerThread lifestyle policy in profile: '"
- + getPath() + "/" + profile.getName()
- + "' unavailable.";
- throw new IllegalArgumentException( error );
- }
- else if( policy.equalsIgnoreCase( "pooled" ) )
- {
- final String error =
- "Pooled lifestyle policy in profile: '"
- + getPath() + "/" + profile.getName()
- + "' unavailable.";
- throw new IllegalArgumentException( error );
- }
- else if( policy.equalsIgnoreCase( "custom" ) )
- {
- String classname =
profile.getType().getInfo().getAttribute("avalon:lifestyle.class");
-
- final String error =
- "Custom lifestyle policy in profile: '"
- + getPath() + "/" + profile.getName()
- + "' for the class: '" + classname + "' not implemeted.";
- throw new IllegalArgumentException( error );
- }
- else
- {
- final String error =
- "Unrecognized lifestyle policy argument: '" + policy + "' in profile:
'"
- + profile.getName();
- throw new IllegalArgumentException( error );
- }
-
- if( handler instanceof LogEnabled )
- ((LogEnabled)handler).enableLogging(
getLocalLogger().getChildLogger("lifestyle") );
-
- DefaultResource designator =
- new DefaultResource( getPath(), profile, context, handler );
- designator.enableLogging( getLocalLogger().getChildLogger( "resource" ) );
- m_resources.put( profile, designator );
- return designator;
-*/
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
