Skip to Content.
Sympa Menu

notify-dpml - r1239 - in trunk/main: metro/runtime/src/main/net/dpml/metro/runtime planet/http/impl/src/main/net/dpml/http station/exec/src/main/net/dpml/station/exec transit/core/src/main/net/dpml/part

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1239 - in trunk/main: metro/runtime/src/main/net/dpml/metro/runtime planet/http/impl/src/main/net/dpml/http station/exec/src/main/net/dpml/station/exec transit/core/src/main/net/dpml/part
  • Date: Tue, 21 Mar 2006 05:48:33 +0100

Author: mcconnell
Date: 2006-03-21 05:48:20 +0100 (Tue, 21 Mar 2006)
New Revision: 1239

Modified:

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java

trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
Log:
fix service version assessment

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-03-21 03:40:18 UTC (rev 1238)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-03-21 04:48:20 UTC (rev 1239)
@@ -632,9 +632,8 @@
//System.out.println( "# CLASS: " + clazz + " / " + c + ", " +
clazz.isAssignableFrom( c ) );
//System.out.println( "# VERSION: " + version + " / " + v + ", "
+ v.complies( version ) );
//System.out.println( "# VERSION/2: " + version.complies( v ) );
- //if( v.complies( version ) && clazz.isAssignableFrom( c ) )

- if( version.complies( v ) && clazz.isAssignableFrom( c ) )
+ if( v.complies( version ) && clazz.isAssignableFrom( c ) )
{
return true;
}

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-03-21 03:40:18 UTC (rev 1238)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-03-21 04:48:20 UTC (rev 1239)
@@ -161,6 +161,7 @@
{
getLogger().debug( "commencing connector addition" );
ComponentHandler[] handlers = parts.getComponentHandlers(
Connector.class );
+ getLogger().debug( "connector count: " + handlers.length );
ArrayList list = new ArrayList();
for( int i=0; i<handlers.length; i++ )
{
@@ -187,6 +188,7 @@
{
getLogger().debug( "commencing context handler addition" );
ComponentHandler[] handlers = parts.getComponentHandlers(
org.mortbay.jetty.handler.ContextHandler.class );
+ getLogger().debug( "handler count: " + handlers.length );
for( int i=0; i<handlers.length; i++ )
{
ComponentHandler handler = handlers[i];

Modified:
trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
===================================================================
---
trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
2006-03-21 03:40:18 UTC (rev 1238)
+++
trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
2006-03-21 04:48:20 UTC (rev 1239)
@@ -118,9 +118,13 @@
throw new ApplicationException( error, e );
}

+ logger.debug( "loading component model" );
Model model = m_controller.createModel( codebase );
+
+ logger.debug( "loading component manager" );
m_component = m_controller.createComponent( model );

+ logger.debug( "handling configuration" );
if( null != config )
{
if( model instanceof Configurable )
@@ -178,6 +182,7 @@
+ model.getClass().getName();
throw new UnsupportedOperationException( error );
}
+ logger.debug( "ready" );
}


//------------------------------------------------------------------------------

Modified:
trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
2006-03-21 03:40:18 UTC (rev 1238)
+++ trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
2006-03-21 04:48:20 UTC (rev 1239)
@@ -52,7 +52,8 @@
* @return the resolved instance
* @exception Exception if a deployment error occurs
*/
- public Object getInstance( ClassLoader anchor, Classpath classpath,
Object data, Object[] args ) throws Exception
+ public Object getInstance(
+ ClassLoader anchor, Classpath classpath, Object data, Object[] args )
throws Exception
{
ClassLoader classloader = getClassLoader( anchor, classpath );
if( data instanceof Plugin )




  • r1239 - in trunk/main: metro/runtime/src/main/net/dpml/metro/runtime planet/http/impl/src/main/net/dpml/http station/exec/src/main/net/dpml/station/exec transit/core/src/main/net/dpml/part, mcconnell at BerliOS, 03/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page