mcconnell 2003/03/06 01:12:27
Modified: assembly/src/java/org/apache/avalon/assembly/lifestyle
TransientLifestyleHandler.java
ThreadLocalLifestyleHandler.java
SingletonLifestyleHandler.java
Log:
Cleaning up of changes to support the Reclaimable interface.
Revision Changes Path
1.10 +1 -12
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/TransientLifestyleHandler.java
Index: TransientLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/TransientLifestyleHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TransientLifestyleHandler.java 7 Feb 2003 15:39:13 -0000 1.9
+++ TransientLifestyleHandler.java 6 Mar 2003 09:12:27 -0000 1.10
@@ -90,22 +90,12 @@
* Activate a service provided by the appliance.
* @param appliance the appliance to deploy
*/
- //public Object access( DependencyDescriptor dependency ) throws
LifestyleException
public Object resolve( Object partition ) throws LocatorException
{
return access();
}
/**
- * Activate an extension handler provided by the appliance.
- * @param appliance the appliance to deploy
- */
- //public Object access( StageDescriptor stage ) throws LifestyleException
- //{
- // return access();
- //}
-
- /**
* Activate the implementation.
* @param appliance the appliance to deploy
*/
@@ -133,7 +123,6 @@
* Release an a service or handler established by the appliance.
* @param object the service to be released
*/
- //public void release( Object object )
public void release( Object object, Object partition )
{
processReleaseStage( object );
1.8 +0 -11
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/ThreadLocalLifestyleHandler.java
Index: ThreadLocalLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/ThreadLocalLifestyleHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ThreadLocalLifestyleHandler.java 15 Jan 2003 09:09:25 -0000 1.7
+++ ThreadLocalLifestyleHandler.java 6 Mar 2003 09:12:27 -0000 1.8
@@ -75,21 +75,11 @@
* Activate a service provided by the appliance.
* @param appliance the appliance to deploy
*/
- //public Object access( DependencyDescriptor dependency ) throws
LifestyleException
public Object resolve( Object partition ) throws LocatorException
{
return access();
}
- /**
- * Activate an extension handler provided by the appliance.
- * @param appliance the appliance to deploy
- */
- //public Object access( StageDescriptor stage ) throws LifestyleException
- //{
- // return access();
- //}
-
/**
* Returns an instance of the object type supported by the
* manager to the client.
@@ -128,7 +118,6 @@
* Release an a service or handler established by the appliance.
* @param object the service to be released
*/
- //public void release( Object object )
public void release( Object object, Object partition )
{
if( object == null )
1.12 +1 -2
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/SingletonLifestyleHandler.java
Index: SingletonLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifestyle/SingletonLifestyleHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SingletonLifestyleHandler.java 7 Feb 2003 15:39:13 -0000 1.11
+++ SingletonLifestyleHandler.java 6 Mar 2003 09:12:27 -0000 1.12
@@ -88,7 +88,6 @@
* Activate a service provided by the appliance.
* @param appliance the appliance to deploy
*/
- //public Object access( DependencyDescriptor dependency ) throws
LifestyleException
public Object resolve( Object partition ) throws LocatorException
{
return access();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
