You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/02/22 16:50:07 UTC
cvs commit: avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle Factory.java
niclas 2004/02/22 07:50:07
Modified: merlin/activation/api/src/java/org/apache/avalon/activation/appliance
Tag: ActivationRestructure ApplianceException.java
Engine.java
merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle
Tag: ActivationRestructure
LifecycleCreateExtension.java
LifecycleDestroyExtension.java
LifecycleException.java
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: ActivationRestructure DefaultAppliance.java
merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl
Tag: ActivationRestructure
AbstractLifestyleHandler.java
ThreadLifestyleHandler.java
merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle
Tag: ActivationRestructure Factory.java
Added: merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle
Tag: ActivationRestructure CreationException.java
CreationPhase.java DestructionException.java
DestructionPhase.java
merlin/activation/impl/src/java/org/apache/avalon/activation/af4
Tag: ActivationRestructure
ApplianceInvocationHandler.java
DefaultAppliance.java DefaultBlock.java
DefaultBlockInvocationHandler.java
DefaultCreationPhaseImpl.java
DefaultDestructionPhaseImpl.java
DefaultServiceManager.java Deployer.java
DeploymentRequest.java SimpleFIFO.java
merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard
Tag: ActivationRestructure ConfigureHandler.java
ContextualizeHandler.java DisposeHandler.java
EnableLoggingHandler.java ExecuteHandler.java
InitializeHandler.java ParameterizeHandler.java
ServiceHandler.java
StandardApplianceInvocationHandler.java
StandardComponentFactory.java StartHandler.java
StopHandler.java
merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/spi
Tag: ActivationRestructure ApplianceFactory.java
BlockFactory.java package.html
Log:
Initial blow at the Activation Restructure.
Revision Changes Path
No revision
No revision
1.2.2.1 +5 -5 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Attic/ApplianceException.java
Index: ApplianceException.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Attic/ApplianceException.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ApplianceException.java 24 Jan 2004 23:25:20 -0000 1.2
+++ ApplianceException.java 22 Feb 2004 15:50:06 -0000 1.2.2.1
@@ -26,7 +26,7 @@
* @version $Revision$ $Date$
*/
public class ApplianceException
- extends CascadingException
+ extends CascadingException
{
/**
@@ -36,7 +36,7 @@
*/
public ApplianceException( final String message )
{
- this( message, null );
+ super( message );
}
/**
@@ -45,9 +45,9 @@
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
- public ApplianceException( final String message, final Throwable throwable )
+ public ApplianceException( final String message, final Throwable cause )
{
- super( message, throwable );
+ super( message, cause );
}
}
1.5.2.1 +1 -5 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Attic/Engine.java
Index: Engine.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Attic/Engine.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- Engine.java 24 Jan 2004 23:25:20 -0000 1.5
+++ Engine.java 22 Feb 2004 15:50:06 -0000 1.5.2.1
@@ -17,11 +17,7 @@
package org.apache.avalon.activation.appliance;
-import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.DeploymentModel;
-import org.apache.avalon.composition.model.DependencyModel;
-import org.apache.avalon.meta.info.DependencyDescriptor;
-import org.apache.avalon.meta.info.StageDescriptor;
/**
* The Engine interface defines the contract for service that provide
No revision
No revision
1.3.2.1 +3 -2 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleCreateExtension.java
Index: LifecycleCreateExtension.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleCreateExtension.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- LifecycleCreateExtension.java 24 Jan 2004 23:25:20 -0000 1.3
+++ LifecycleCreateExtension.java 22 Feb 2004 15:50:06 -0000 1.3.2.1
@@ -17,6 +17,7 @@
package org.apache.avalon.activation.lifecycle;
+import org.apache.avalon.activation.appliance.Engine;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -29,7 +30,7 @@
* @param object the object under deployment
* @exception if a deployment error occurs
*/
- public void create( ComponentModel model, StageDescriptor stage, Object object)
- throws Exception;
+ void create( ComponentModel model, Engine engine, StageDescriptor stage, Object object)
+ throws CreationException;
}
1.3.2.1 +3 -2 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleDestroyExtension.java
Index: LifecycleDestroyExtension.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleDestroyExtension.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- LifecycleDestroyExtension.java 24 Jan 2004 23:25:20 -0000 1.3
+++ LifecycleDestroyExtension.java 22 Feb 2004 15:50:06 -0000 1.3.2.1
@@ -17,6 +17,7 @@
package org.apache.avalon.activation.lifecycle;
+import org.apache.avalon.activation.appliance.Engine;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -29,6 +30,6 @@
* @param object the object under deployment
* @exception if a deployment error occurs
*/
- public void destroy( ComponentModel model, StageDescriptor stage, Object object)
- throws Exception;
+ void destroy( ComponentModel model, Engine engine, StageDescriptor stage, Object object)
+ throws DestructionException;
}
1.2.2.1 +3 -4 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleException.java
Index: LifecycleException.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleException.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- LifecycleException.java 24 Jan 2004 23:25:20 -0000 1.2
+++ LifecycleException.java 22 Feb 2004 15:50:06 -0000 1.2.2.1
@@ -25,8 +25,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class LifecycleException
- extends CascadingException
+public class LifecycleException extends CascadingException
{
/**
@@ -36,7 +35,7 @@
*/
public LifecycleException( final String message )
{
- this( message, null );
+ super( message );
}
/**
No revision
Index: LifecycleException.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleException.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- LifecycleException.java 24 Jan 2004 23:25:20 -0000 1.2
+++ LifecycleException.java 22 Feb 2004 15:50:06 -0000 1.2.2.1
@@ -25,8 +25,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class LifecycleException
- extends CascadingException
+public class LifecycleException extends CascadingException
{
/**
@@ -36,7 +35,7 @@
*/
public LifecycleException( final String message )
{
- this( message, null );
+ super( message );
}
/**
No revision
Index: LifecycleException.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/LifecycleException.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- LifecycleException.java 24 Jan 2004 23:25:20 -0000 1.2
+++ LifecycleException.java 22 Feb 2004 15:50:06 -0000 1.2.2.1
@@ -25,8 +25,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class LifecycleException
- extends CascadingException
+public class LifecycleException extends CascadingException
{
/**
@@ -36,7 +35,7 @@
*/
public LifecycleException( final String message )
{
- this( message, null );
+ super( message );
}
/**
1.1.2.1 +85 -0 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/CreationException.java
1.1.2.1 +35 -0 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/CreationPhase.java
1.1.2.1 +85 -0 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/DestructionException.java
1.1.2.1 +34 -0 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/Attic/DestructionPhase.java
No revision
No revision
1.1.2.1 +33 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/ApplianceInvocationHandler.java
1.1.2.1 +587 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DefaultAppliance.java
1.1.2.1 +470 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DefaultBlock.java
1.1.2.1 +140 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DefaultBlockInvocationHandler.java
1.1.2.1 +152 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DefaultCreationPhaseImpl.java
1.1.2.1 +153 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DefaultDestructionPhaseImpl.java
1.1.2.1 +198 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DefaultServiceManager.java
1.1.2.1 +209 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/Deployer.java
1.1.2.1 +161 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/DeploymentRequest.java
1.1.2.1 +73 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/Attic/SimpleFIFO.java
No revision
No revision
1.1.2.1 +71 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/ConfigureHandler.java
1.1.2.1 +111 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/ContextualizeHandler.java
1.1.2.1 +70 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/DisposeHandler.java
1.1.2.1 +64 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/EnableLoggingHandler.java
1.1.2.1 +71 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/ExecuteHandler.java
1.1.2.1 +70 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/InitializeHandler.java
1.1.2.1 +71 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/ParameterizeHandler.java
1.1.2.1 +104 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/ServiceHandler.java
1.1.2.1 +159 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/StandardApplianceInvocationHandler.java
1.1.2.1 +216 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/StandardComponentFactory.java
1.1.2.1 +71 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/StartHandler.java
1.1.2.1 +71 -0 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/af4/standard/Attic/StopHandler.java
No revision
No revision
1.26.2.1 +22 -22 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Attic/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Attic/DefaultAppliance.java,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -r1.26 -r1.26.2.1
--- DefaultAppliance.java 24 Jan 2004 23:25:21 -0000 1.26
+++ DefaultAppliance.java 22 Feb 2004 15:50:07 -0000 1.26.2.1
@@ -41,7 +41,8 @@
import org.apache.avalon.activation.lifecycle.Factory;
import org.apache.avalon.activation.lifecycle.LifecycleCreateExtension;
import org.apache.avalon.activation.lifecycle.LifecycleDestroyExtension;
-import org.apache.avalon.activation.lifecycle.LifecycleException;
+import org.apache.avalon.activation.lifecycle.CreationException;
+import org.apache.avalon.activation.lifecycle.DestructionException;
import org.apache.avalon.activation.lifestyle.LifestyleHandler;
import org.apache.avalon.activation.lifestyle.impl.SingletonLifestyleHandler;
import org.apache.avalon.activation.lifestyle.impl.ThreadLifestyleHandler;
@@ -509,7 +510,7 @@
//-------------------------------------------------------------------
private Object createNewInstance( Class clazz )
- throws LifecycleException
+ throws CreationException
{
try
{
@@ -520,7 +521,7 @@
final String error =
REZ.getString(
"lifecycle.instantiation.error", clazz.getName() );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
@@ -593,7 +594,7 @@
REZ.getString(
"lifecycle.contextualization.custom.error",
m_model.getQualifiedName() );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
else if( instance instanceof Contextualizable )
@@ -628,7 +629,7 @@
REZ.getString(
"lifecycle.contextualization.component.error",
m_model.getQualifiedName() );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
}
@@ -774,11 +775,11 @@
"lifecycle.stage.creator.error", stage.getKey() );
if( flag )
{
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
else
{
- getLogger().warn( error, e );
+ throw new DestructionException( error, e );
}
}
finally
@@ -798,7 +799,7 @@
int id = System.identityHashCode( instance );
getLogger().debug( "applying model create stage to: " + id );
}
- handler.create( m_model, stage, instance );
+ handler.create( m_model, m_engine, stage, instance );
}
finally
{
@@ -817,7 +818,7 @@
int id = System.identityHashCode( instance );
getLogger().debug( "applying model destroy stage to: " + id );
}
- handler.destroy( m_model, stage, instance );
+ handler.destroy( m_model, m_engine, stage, instance );
}
catch( Throwable e )
{
@@ -884,11 +885,11 @@
stage.getKey() );
if( flag )
{
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
else
{
- getLogger().warn( error, e );
+ throw new DestructionException( error, e );
}
}
finally
@@ -901,7 +902,7 @@
}
private void applyInitialization( final Object instance )
- throws LifecycleException
+ throws CreationException
{
if( instance instanceof Initializable )
{
@@ -932,13 +933,13 @@
{
final String error =
REZ.getString( "lifecycle.initialize.component.error" );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
}
private void applyStart( final Object instance )
- throws LifecycleException
+ throws CreationException
{
if( instance instanceof Startable )
{
@@ -969,7 +970,7 @@
{
final String error =
REZ.getString( "lifecycle.start.component.error" );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
else if( instance instanceof Executable )
@@ -1001,7 +1002,7 @@
{
final String error =
REZ.getString( "lifecycle.execute.component.error" );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
}
@@ -1113,7 +1114,7 @@
REZ.getString(
"deployment.contextualization.custom-resolve.error",
appliance.getModel().getQualifiedName() );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
@@ -1351,7 +1352,6 @@
/**
* Return the component deployment model.
*
- * @exception LifecycleException
*/
public ComponentModel getComponentModel()
{
@@ -1363,7 +1363,7 @@
*
* @exception LifecycleException
*/
- public Object newInstance() throws LifecycleException
+ public Object newInstance() throws CreationException
{
Class clazz = m_model.getDeploymentClass();
Object instance = null;
@@ -1395,7 +1395,7 @@
{
final String error =
REZ.getString( "lifestyle.new.error", m_model.getQualifiedName() );
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
try
@@ -1407,7 +1407,7 @@
getLogger().error( e.getMessage() );
final String error =
"Provider publication failure.";
- throw new LifecycleException( error, e );
+ throw new CreationException( error, e );
}
}
No revision
No revision
1.8.2.1 +9 -2 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/Attic/AbstractLifestyleHandler.java
Index: AbstractLifestyleHandler.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/Attic/AbstractLifestyleHandler.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- AbstractLifestyleHandler.java 24 Jan 2004 23:25:22 -0000 1.8
+++ AbstractLifestyleHandler.java 22 Feb 2004 15:50:07 -0000 1.8.2.1
@@ -92,7 +92,14 @@
{
synchronized( getFactory() )
{
- m_factory.destroy( instance );
+ try
+ {
+ m_factory.destroy( instance );
+ } catch( Exception e )
+ {
+ // TODO: ????
+ // Perhaps report to an Error facility.
+ }
}
}
}
1.6.2.1 +5 -3 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/Attic/ThreadLifestyleHandler.java
Index: ThreadLifestyleHandler.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/Attic/ThreadLifestyleHandler.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- ThreadLifestyleHandler.java 24 Jan 2004 23:25:22 -0000 1.6
+++ ThreadLifestyleHandler.java 22 Feb 2004 15:50:07 -0000 1.6.2.1
@@ -17,6 +17,7 @@
package org.apache.avalon.activation.lifestyle.impl;
+import org.apache.avalon.activation.lifecycle.DestructionException;
import org.apache.avalon.activation.lifecycle.LifecycleRuntimeException;
import org.apache.avalon.activation.lifecycle.Factory;
import org.apache.avalon.framework.logger.Logger;
@@ -26,7 +27,8 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class ThreadLifestyleHandler extends AbstractLifestyleHandler implements Disposable
+public class ThreadLifestyleHandler extends AbstractLifestyleHandler
+ implements Disposable
{
/**
* Internal utility class to hold the thread local instance.
@@ -115,7 +117,7 @@
{
if( m_local != null )
{
- m_factory.destroy( m_local.get() );
+ disposeInstance( m_local.get() );
}
m_local = null;
}
No revision
No revision
1.1.2.1 +81 -0 avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/spi/Attic/ApplianceFactory.java
1.1.2.1 +81 -0 avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/spi/Attic/BlockFactory.java
1.1.2.1 +9 -0 avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/spi/Attic/package.html
No revision
No revision
1.4.2.1 +3 -5 avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle/Attic/Factory.java
Index: Factory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle/Attic/Factory.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Factory.java 24 Jan 2004 23:25:23 -0000 1.4
+++ Factory.java 22 Feb 2004 15:50:07 -0000 1.4.2.1
@@ -17,7 +17,6 @@
package org.apache.avalon.activation.lifecycle;
-import org.apache.avalon.activation.lifecycle.LifecycleException;
import org.apache.avalon.composition.model.ComponentModel;
/**
@@ -41,13 +40,12 @@
*
* @exception LifecycleException
*/
- Object newInstance() throws LifecycleException;
+ Object newInstance() throws CreationException;
/**
* Decommission and dispose of the supplied component.
*
* @param instance the object to decommission
*/
- void destroy( Object instance );
-
+ void destroy( Object instance ) throws DestructionException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org