CVS: plexus-container/src/conf plexus.conf,1.10,1.11

Update of /cvsroot/plexus/plexus-container/src/conf
In directory hogshead.codehaus.org:/tmp/cvs-serv25662/src/conf

Modified Files:
	plexus.conf 
Log Message:
o first pass at integrating bert's patch. checking it in so that bert can
  look at some stuff for me.


Index: plexus.conf
===================================================================
RCS file: /cvsroot/plexus/plexus-container/src/conf/plexus.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- plexus.conf	10 May 2003 16:39:29 -0000	1.10
+++ plexus.conf	5 Aug 2003 19:26:23 -0000	1.11
@@ -8,77 +8,91 @@
   <resource-manager>
     <implementation>org.apache.plexus.classloader.DefaultResourceManager</implementation>
   </resource-manager>
-  <lifecycle-handler>
-    <id>avalon-lifecycle-handler</id>
-    <name>Avalon Lifecycle Handler</name>
-    <implementation>org.apache.plexus.lifecycle.avalon.AvalonLifecycleHandler</implementation>
-    <start-segment>
-      <phase implementation="org.apache.plexus.lifecycle.phase.LogEnablePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ContextualizePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ServicePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ConfigurePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ParameterizePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.InitializePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.StartPhase"/>
-    </start-segment>
-    <suspend-segment>
-      <phase implementation="org.apache.plexus.lifecycle.phase.SuspendPhase"/>
-    </suspend-segment>
-    <resume-segment>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ResumePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.RecontextualizePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ReconfigurePhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.ReparameterizePhase"/>
-    </resume-segment>
-    <end-segment>
-      <phase implementation="org.apache.plexus.lifecycle.phase.StopPhase"/>
-      <phase implementation="org.apache.plexus.lifecycle.phase.DisposePhase"/>
-    </end-segment>
-  </lifecycle-handler>
-
-  <!-- Default Components -->
-
-  <components>
-    <!--
-     |
-     | These are the default component factories.
-     |
-     -->
-    <component>
-      <role>org.apache.plexus.service.repository.factory.ComponentFactory</role>
-      <role-hint>java</role-hint>
-      <implementation>org.apache.plexus.service.repository.factory.JavaComponentFactory</implementation>
-      <configuration>
-      </configuration>
-    </component>
+  <lifecycle-handlers default="avalon">
+    <lifecycle-handler>
+      <id>avalon</id>
+      <name>Avalon Lifecycle Handler</name>
+      <implementation>org.apache.plexus.lifecycle.avalon.AvalonLifecycleHandler</implementation>
+      <start-segment>
+        <phase implementation="org.apache.plexus.lifecycle.phase.LogEnablePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ContextualizePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ServicePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ConfigurePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ParameterizePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.InitializePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.StartPhase"/>
+      </start-segment>
+      <suspend-segment>
+        <phase implementation="org.apache.plexus.lifecycle.phase.SuspendPhase"/>
+      </suspend-segment>
+      <resume-segment>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ResumePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.RecontextualizePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ReconfigurePhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.ReparameterizePhase"/>
+      </resume-segment>
+      <end-segment>
+        <phase implementation="org.apache.plexus.lifecycle.phase.StopPhase"/>
+        <phase implementation="org.apache.plexus.lifecycle.phase.DisposePhase"/>
+      </end-segment>
+    </lifecycle-handler>
+  </lifecycle-handlers>
 
-    <!--
-     |
-     | These are the default instance managers.
-     |
-     -->
-    <component>
+  <!--
+   |
+   | Instance managers.
+   |
+   -->
+  <instantiation-managers default="singleton">
+    <instance-manager>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>New component instance per lookup which is disposed upon release</description>
       <role>org.apache.plexus.service.repository.instance.InstanceManager</role>
-      <role-hint>per-lookup</role-hint>
       <implementation>org.apache.plexus.service.repository.instance.PerLookupInstanceManager</implementation>
       <configuration>
-        <tag>per-lookup</tag>
       </configuration>
-    </component>
-    <component>
+    </instance-manager>
+    <instance-manager>
+      <instantiation-strategy>poolable</instantiation-strategy>
+      <description>Component is pooled and only disposed when the pool gets too big. Growable pool</description>
       <role>org.apache.plexus.service.repository.instance.InstanceManager</role>
-      <role-hint>poolable</role-hint>
       <implementation>org.apache.plexus.service.repository.instance.PoolableInstanceManager</implementation>
       <configuration>
-        <tag>poolable</tag>
+        <initial-capacity>5</initial-capacity>
+        <sweep-interval>5</sweep-interval>
+        <max-capacity>30</max-capacity>
+        <min-capacity>5</min-capacity>
+        <trigger-size>20</trigger-size>
       </configuration>
-    </component>
-    <component>
+    </instance-manager>
+    <instance-manager>
+      <instantiation-strategy>singleton</instantiation-strategy>
+      <description>The classic singleton manager. Once no more components are connected the
+        instance is disposed</description>
       <role>org.apache.plexus.service.repository.instance.InstanceManager</role>
-      <role-hint>singleton</role-hint>
-      <implementation>org.apache.plexus.service.repository.instance.SingletonInstanceManager</implementation>
+      <implementation>org.apache.plexus.service.repository.instance.ClassicSingletonInstanceManager</implementation>
+      <configuration>
+      </configuration>
+    </instance-manager>
+    <instance-manager>
+      <instantiation-strategy>singleton-keep-alive</instantiation-strategy>
+      <description>Singleton instance manager which keeps a single instance alive until
+        the component repository is disposed.</description>
+      <role>org.apache.plexus.service.repository.instance.InstanceManager</role>
+      <implementation>org.apache.plexus.service.repository.instance.KeepAliveSingletonInstanceManager</implementation>
+      <configuration>
+      </configuration>
+    </instance-manager>
+  </instantiation-managers>
+
+  <!-- Default Components -->
+
+  <components>
+    <component>
+      <role>org.apache.plexus.service.repository.factory.ComponentFactory</role>
+      <role-hint>java</role-hint>
+      <implementation>org.apache.plexus.service.repository.factory.JavaComponentFactory</implementation>
       <configuration>
-        <tag>poolable</tag>
       </configuration>
     </component>
   </components>