Skip to Content.
Sympa Menu

notify-dpml - r952 - in trunk/main/metro: part/api/src/main/net/dpml/part/local tools/src/main/net/dpml/metro/tools

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: r952 - in trunk/main/metro: part/api/src/main/net/dpml/part/local tools/src/main/net/dpml/metro/tools
  • Date: Mon, 23 Jan 2006 05:02:44 +0100

Author: mcconnell
Date: 2006-01-23 05:02:39 +0100 (Mon, 23 Jan 2006)
New Revision: 952

Modified:
trunk/main/metro/part/api/src/main/net/dpml/part/local/Controller.java
trunk/main/metro/part/api/src/main/net/dpml/part/local/InitialContext.java

trunk/main/metro/tools/src/main/net/dpml/metro/tools/ClassLoaderBuilderTask.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
Log:
clean build corrections

Modified:
trunk/main/metro/part/api/src/main/net/dpml/part/local/Controller.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/local/Controller.java
2006-01-23 03:42:57 UTC (rev 951)
+++ trunk/main/metro/part/api/src/main/net/dpml/part/local/Controller.java
2006-01-23 04:02:39 UTC (rev 952)
@@ -40,11 +40,6 @@
* Static default controller.
*/
static final Controller STANDARD = InitialContext.createController();
-
- /**
- * Static default controller.
- */
- //static final Controller STANDARD = InitialContext.CONTROLLER;

/**
* Returns the identity of the object implementing this interface.

Modified:
trunk/main/metro/part/api/src/main/net/dpml/part/local/InitialContext.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/local/InitialContext.java
2006-01-23 03:42:57 UTC (rev 951)
+++
trunk/main/metro/part/api/src/main/net/dpml/part/local/InitialContext.java
2006-01-23 04:02:39 UTC (rev 952)
@@ -49,10 +49,10 @@
// static

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

- private static InitalContext m_CONTEXT;
-
/**
- * Create the default controller.
+ * Create the default controller using the default initial context.
+ * The default context and associated controller disposal will be
triggered
+ * on JVM shutdown.
*/
public static Controller createController()
{
@@ -60,12 +60,15 @@
}

/**
- * Create the default controller.
+ * Create the default controller. Controller disposal is the
responsiblity
+ * of the client application.
+ *
* @param context the controller context
*/
- public static Controller createController( InitialContext context )
+ public static Controller createController( final InitialContext context )
{
- ControllerInvocationHandler handler = new
ControllerInvocationHandler( context );
+ ControllerInvocationHandler handler =
+ new ControllerInvocationHandler( context );
return (Controller) Proxy.newProxyInstance(
Controller.class.getClassLoader(), new Class[]{Controller.class},
handler );
}

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ClassLoaderBuilderTask.java
===================================================================
---
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ClassLoaderBuilderTask.java
2006-01-23 03:42:57 UTC (rev 951)
+++
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ClassLoaderBuilderTask.java
2006-01-23 04:02:39 UTC (rev 952)
@@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.metro.runtime.CompositionController;
+//import net.dpml.metro.runtime.CompositionController;

import net.dpml.metro.data.ClassLoaderDirective;
import net.dpml.metro.data.ClasspathDirective;
@@ -32,6 +32,8 @@
import net.dpml.library.info.Scope;
import net.dpml.library.model.Resource;

+import net.dpml.part.local.Controller;
+
import net.dpml.transit.tools.AntAdapter;
import net.dpml.transit.Logger;
import net.dpml.transit.Category;
@@ -68,12 +70,13 @@
* Get the composition controller.
* @return the controller
*/
- protected CompositionController getController()
+ protected Controller getController()
{
try
{
- Logger logger = new AntAdapter( this );
- return new CompositionController( logger );
+ return Controller.STANDARD;
+ //Logger logger = new AntAdapter( this );
+ //return new CompositionController( logger );
}
catch( Throwable e )
{

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
2006-01-23 03:42:57 UTC (rev 951)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
2006-01-23 04:02:39 UTC (rev 952)
@@ -29,6 +29,7 @@
import net.dpml.part.Directive;
import net.dpml.part.DelegationException;
import net.dpml.part.PartNotFoundException;
+import net.dpml.part.local.Controller;

import net.dpml.transit.Logger;
import net.dpml.transit.tools.AntAdapter;
@@ -144,9 +145,10 @@
URI uri = getURI();
try
{
- Logger logger = new AntAdapter( this );
- CompositionController controller = new CompositionController(
logger );
- return controller.loadDirective( uri );
+ //Logger logger = new AntAdapter( this );
+ //CompositionController controller = new CompositionController(
logger );
+ //return controller.loadDirective( uri );
+ return Controller.STANDARD.loadDirective( uri );
}
catch( PartNotFoundException pnfe )
{




  • r952 - in trunk/main/metro: part/api/src/main/net/dpml/part/local tools/src/main/net/dpml/metro/tools, mcconnell at BerliOS, 01/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page