notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r967 - in trunk/main: . metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/main/net/dpml/test/app metro/test/src/main/net/dpml/test/composite
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r967 - in trunk/main: . metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/main/net/dpml/test/app metro/test/src/main/net/dpml/test/composite
- Date: Tue, 24 Jan 2006 16:26:48 +0100
Author: mcconnell
Date: 2006-01-24 16:26:47 +0100 (Tue, 24 Jan 2006)
New Revision: 967
Modified:
trunk/main/build.xml
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
Log:
sync changes
Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-01-24 15:19:30 UTC (rev 966)
+++ trunk/main/build.xml 2006-01-24 15:26:47 UTC (rev 967)
@@ -221,7 +221,6 @@
<group title="Metro">
<package name="net.dpml.metro"/>
<package name="net.dpml.metro.*"/>
- <package name="net.dpml.metro.tools"/>
<package name="net.dpml.part"/>
<package name="net.dpml.part.*"/>
<package name="net.dpml.state"/>
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-24 15:19:30 UTC (rev 966)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-24 15:26:47 UTC (rev 967)
@@ -48,7 +48,7 @@
import net.dpml.part.Directive;
import net.dpml.part.ControlException;
import net.dpml.part.Version;
-import net.dpml.part.local.PartsManager;
+import net.dpml.metro.control.PartsManager;
import net.dpml.part.remote.Component;
import net.dpml.part.remote.Model;
import net.dpml.part.remote.ServiceNotFoundException;
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-01-24 15:19:30 UTC (rev 966)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-01-24 15:26:47 UTC (rev 967)
@@ -30,7 +30,7 @@
import net.dpml.part.ControlException;
import net.dpml.part.remote.Component;
import net.dpml.part.remote.Model;
-import net.dpml.part.local.PartsManager;
+import net.dpml.metro.control.PartsManager;
import net.dpml.metro.control.Handler;
import net.dpml.lang.UnknownKeyException;
@@ -89,7 +89,7 @@
try
{
ComponentModel m = model.getComponentModel( key );
- Component h = control.createComponentHandler( handler,
classloader, m );
+ Component h = control.createComponentHandler( handler,
classloader, m, true );
m_handlers.put( key, h );
}
catch( UnknownKeyException e )
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-01-24 15:19:30 UTC (rev 966)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-01-24 15:26:47 UTC (rev 967)
@@ -24,7 +24,7 @@
import net.dpml.metro.control.Handler;
import net.dpml.part.remote.Component;
-import net.dpml.part.local.PartsManager;
+import net.dpml.metro.control.PartsManager;
/**
* Invoication handler for the Context inner class. The invocation handler
is
Modified: trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java
===================================================================
--- trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java 2006-01-24
15:19:30 UTC (rev 966)
+++ trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java 2006-01-24
15:26:47 UTC (rev 967)
@@ -20,7 +20,7 @@
import net.dpml.logging.Logger;
-import net.dpml.part.local.PartsManager;
+import net.dpml.metro.control.PartsManager;
import net.dpml.metro.control.Handler;
/**
Modified:
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
===================================================================
---
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
2006-01-24 15:19:30 UTC (rev 966)
+++
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
2006-01-24 15:26:47 UTC (rev 967)
@@ -25,7 +25,7 @@
import net.dpml.test.ColorManager;
-import net.dpml.part.local.PartsManager;
+import net.dpml.metro.control.PartsManager;
import net.dpml.metro.control.Handler;
import net.dpml.lang.UnknownKeyException;
- r967 - in trunk/main: . metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/main/net/dpml/test/app metro/test/src/main/net/dpml/test/composite, mcconnell at BerliOS, 01/24/2006
Archive powered by MHonArc 2.6.24.