ApplicationListsner Changes - ready to commit

[Paul Hammant]

Peter,

Coded, Tested and Working.  If/when you give the and, I'll commit them.

--------------------------------------------------------------------------------
RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.7
diff -r1.7 DefaultApplication.java
17a18
 > import org.apache.avalon.phoenix.ApplicationEvent;
21a23
 > import org.apache.avalon.phoenix.metadata.SarMetaData;
42a45,50
 >     private SarMetaData m_sarMetaData;
 >
 >     public DefaultApplication(SarMetaData _sarMetaData)
 >     {
 >         m_sarMetaData = _sarMetaData;
 >     }
161a170,178
 >         if( PHASE_STARTUP == name )
 >         {
 >             m_lifecycle.applicationStarting(new 
ApplicationEvent(m_sarMetaData.getName(), m_sarMetaData));
 >         }
 >         else
 >         {
 >             m_lifecycle.applicationStopping();
 >         }
 >
183a201
 >                 m_lifecycle.applicationFailure(e);
193a212,221
 >
 >         if( PHASE_STARTUP == name )
 >         {
 >             m_lifecycle.applicationStarted();
 >         }
 >         else
 >         {
 >             m_lifecycle.applicationStopped();
 >         }
 >

-----------------------------------------------------

DefaultKernel :

  application = new DefaultApplication();

changes to

  application = new DefaultApplication(entry.getMetaData());

-----------------------------------------------------

RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java,v
retrieving revision 1.26
diff -r1.26 LifecycleHelper.java
35a36,37
 > import org.apache.avalon.phoenix.ApplicationListener;
 > import org.apache.avalon.phoenix.ApplicationEvent;
86c88,93
<     private BlockListenerSupport m_listenerSupport = new 
BlockListenerSupport();
---
 >     private BlockListenerSupport m_blockListenerSupport = new 
BlockListenerSupport();
 >
 >     /**
 >      * Object to support notification of ApplicationListeners.
 >      */
 >     private ApplicationListenerSupport m_applicationListenerSupport = 
new ApplicationListenerSupport();
132c139,172
<         m_listenerSupport.addBlockListener( listener );
---
 >         m_blockListenerSupport.addBlockListener( listener );
 >
 >         if (listener instanceof ApplicationListener)
 >         {
 >             m_applicationListenerSupport.addApplicationListener( 
(ApplicationListener) listener );
 >         }
 >
 >
 >
 >     }
 >
 >     public void applicationStarting(ApplicationEvent appEvent) throws 
Exception
 >     {
 >         m_applicationListenerSupport.applicationStarting(appEvent);
 >     }
 >
 >     public void applicationStarted()
 >     {
 >         m_applicationListenerSupport.applicationStarted();
 >     }
 >
 >     public void applicationStopping()
 >     {
 >         m_applicationListenerSupport.applicationStopping();
 >     }
 >
 >     public void applicationStopped()
 >     {
 >         m_applicationListenerSupport.applicationStopped();
 >     }
 >
 >     public void applicationFailure(Exception causeOfFailure)
 >     {
 >         m_applicationListenerSupport.applicationFailure(causeOfFailure);
240c280
<             m_listenerSupport.blockAdded( event );
---
 >             m_blockListenerSupport.blockAdded( event );
265c305
<         m_listenerSupport.blockRemoved( event );
---
 >         m_blockListenerSupport.blockRemoved( event );

-----------------------------------------------------------------

RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java,v
retrieving revision 1.7
diff -r1.7 Assembler.java
74c74
<         final Configuration[] listenerConfig = assembly.getChildren( 
"block-listener" );
---
 >         final Configuration[] listenerConfig = assembly.getChildren( 
"listener" );
178c178
<      * the &lt;block-listener .../&gt; sections in 
<code>assembly.xml</code>.
---
 >      * the &lt;listener .../&gt; sections in <code>assembly.xml</code>.
199c199
<      * the specified &lt;block-listener .../&gt; section.
---
 >      * the specified &lt;listener .../&gt; section.


-----------------------------------------------------------------

Plus one new file attached.....

Tests are in Cornerstone/SimpleServer.  Boots and exists calling 
appropriate methods just fine.

- Paul


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>