You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/04/06 23:23:34 UTC
cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application BlockResourceProvider.java DefaultApplication.java ListenerResourceProvider.java
donaldp 2003/04/06 14:23:34
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockResourceProvider.java DefaultApplication.java
Removed: src/java/org/apache/avalon/phoenix/components/application
ListenerResourceProvider.java
Log:
Collapse ListenerResourceProvider into BlockResourceProvider
Revision Changes Path
1.23 +2 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
Index: BlockResourceProvider.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BlockResourceProvider.java 6 Apr 2003 11:23:21 -0000 1.22
+++ BlockResourceProvider.java 6 Apr 2003 21:23:34 -0000 1.23
@@ -47,7 +47,6 @@
Apache Software Foundation, please see <http://www.apache.org/>.
*/
-
package org.apache.avalon.phoenix.components.application;
import java.lang.reflect.Array;
@@ -356,6 +355,6 @@
*/
private ComponentProfile getProfileFor( final Object entry )
{
- return ( (BlockEntry)entry ).getProfile();
+ return (ComponentProfile)entry;
}
}
1.47 +3 -12 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- DefaultApplication.java 5 Apr 2003 04:25:41 -0000 1.46
+++ DefaultApplication.java 6 Apr 2003 21:23:34 -0000 1.47
@@ -47,7 +47,6 @@
Apache Software Foundation, please see <http://www.apache.org/>.
*/
-
package org.apache.avalon.phoenix.components.application;
import java.io.File;
@@ -107,11 +106,6 @@
private BlockResourceProvider m_blockAccessor;
/**
- * ResourceProvider for listeners.
- */
- private ListenerResourceProvider m_listenerAccessor;
-
- /**
* Object to support notification of ApplicationListeners.
*/
private final ListenerSupport m_listenerSupport = new ListenerSupport();
@@ -263,8 +257,6 @@
m_context = context;
m_blockAccessor = new BlockResourceProvider( context, this );
setupLogger( m_blockAccessor, "lifecycle" );
- m_listenerAccessor = new ListenerResourceProvider( context );
- setupLogger( m_listenerAccessor, "lifecycle" );
}
public String[] getBlockNames()
@@ -536,7 +528,7 @@
{
final Object block =
m_lifecycleHelper.startup( entry.getName(),
- entry,
+ entry.getProfile(),
m_blockAccessor );
m_exportHelper.exportBlock( m_context,
@@ -567,8 +559,7 @@
{
//Remove block from Management system
m_exportHelper.unexportBlock( m_context,
- entry.getProfile()
- );
+ entry.getProfile() );
entry.invalidate();
m_lifecycleHelper.shutdown( entry.getName(),
@@ -596,7 +587,7 @@
final Object listener =
m_lifecycleHelper.startup( name,
profile,
- m_listenerAccessor );
+ m_blockAccessor );
// However onky ApplicationListners can avail of block events.
if( listener instanceof ApplicationListener )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org