Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1999 - in development/laboratory/plus: . common/builder common/control common/kernel common/kernel/src/main/net/dpml/metro/kernel composition/builder composition/builder/src/main/net/dpml/composition/builder composition/control test/example/api test/example/impl

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1999 - in development/laboratory/plus: . common/builder common/control common/kernel common/kernel/src/main/net/dpml/metro/kernel composition/builder composition/builder/src/main/net/dpml/composition/builder composition/control test/example/api test/example/impl
  • Date: Wed, 09 Mar 2005 15:13:37 -0500

Author: mcconnell AT dpml.net
Date: Wed Mar 9 15:13:37 2005
New Revision: 1999

Modified:
development/laboratory/plus/common/builder/ (props changed)
development/laboratory/plus/common/control/ (props changed)
development/laboratory/plus/common/kernel/ (props changed)

development/laboratory/plus/common/kernel/src/main/net/dpml/metro/kernel/DefaultKernel.java
development/laboratory/plus/composition/builder/build.xml

development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
development/laboratory/plus/composition/control/ (props changed)
development/laboratory/plus/index.xml
development/laboratory/plus/test/example/api/ (props changed)
development/laboratory/plus/test/example/impl/ (props changed)
Log:


Modified:
development/laboratory/plus/common/kernel/src/main/net/dpml/metro/kernel/DefaultKernel.java
==============================================================================
---
development/laboratory/plus/common/kernel/src/main/net/dpml/metro/kernel/DefaultKernel.java
(original)
+++
development/laboratory/plus/common/kernel/src/main/net/dpml/metro/kernel/DefaultKernel.java
Wed Mar 9 15:13:37 2005
@@ -21,6 +21,7 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.IOException;
+import java.io.Serializable;
import java.rmi.MarshalledObject;
import java.net.URI;

@@ -28,6 +29,7 @@
import net.dpml.metro.part.PartEnvelope;
import net.dpml.metro.control.Controller;
import net.dpml.metro.control.ControlMonitor;
+import net.dpml.transit.repository.StandardLoader;

/**
* The contract for builders that create component part.
@@ -42,9 +44,13 @@
ObjectInputStream stream = new ObjectInputStream( input );
MarshalledObject marshalled = (MarshalledObject) stream.readObject();
PartEnvelope envelope = (PartEnvelope) marshalled.get();
+ Serializable part = envelope.getPart();
URI uri = envelope.getControllerURI();
+ StandardLoader loader = new StandardLoader();
+ ClassLoader classloader = Part.class.getClassLoader();
ControlMonitor monitor = new DefaultControlMonitor();
monitor.info( "loading controller uri: " + uri );
+ loader.getPlugin( classloader, uri, new Object[]{ monitor, part } );
}

private static class DefaultControlMonitor implements ControlMonitor

Modified: development/laboratory/plus/composition/builder/build.xml
==============================================================================
--- development/laboratory/plus/composition/builder/build.xml (original)
+++ development/laboratory/plus/composition/builder/build.xml Wed Mar 9
15:13:37 2005
@@ -6,6 +6,10 @@

<transit:import uri="artifact:template:dpml/magic/standard"/>

+ <target name="init" depends="standard.init">
+ <x:filter key="dpml-composition-control" feature="plugin"
token="CONTROLLER-URI"/>
+ </target>
+
<target name="package" depends="standard.package">
<x:export>
<antlib resource="net/dpml/composition/builder/antlib.xml"

Modified:
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
==============================================================================
---
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
(original)
+++
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
Wed Mar 9 15:13:37 2005
@@ -50,6 +50,12 @@
public class ComponentModelBuilder extends ProjectTask implements PartBuilder
{
//--------------------------------------------------------------------
+ // static
+ //--------------------------------------------------------------------
+
+ private static String DEFAULT_CONTROLLER_URI = "@CONTROLLER-URI@";
+
+ //--------------------------------------------------------------------
// state
//--------------------------------------------------------------------

@@ -122,7 +128,7 @@
try
{
Part part = build();
- URI uri = new URI( "acme:gizmo" );
+ URI uri = new URI( DEFAULT_CONTROLLER_URI );
PartEnvelope envelope = new PartEnvelope( part, uri );
marshall( envelope );
}

Modified: development/laboratory/plus/index.xml
==============================================================================
--- development/laboratory/plus/index.xml (original)
+++ development/laboratory/plus/index.xml Wed Mar 9 15:13:37 2005
@@ -74,6 +74,7 @@
<dependencies>
<include key="dpml-metro-part-api"/>
<include key="dpml-metro-control-api"/>
+ <include key="dpml-transit-main"/>
</dependencies>
</project>




  • svn commit: r1999 - in development/laboratory/plus: . common/builder common/control common/kernel common/kernel/src/main/net/dpml/metro/kernel composition/builder composition/builder/src/main/net/dpml/composition/builder composition/control test/example/api test/example/impl, mcconnell, 03/09/2005

Archive powered by MHonArc 2.6.24.

Top of Page