Skip to Content.
Sympa Menu

notify-dpml - r1196 - in trunk/main: . depot lang/module/etc metro/builder/src/main/net/dpml/metro/builder metro/builder/src/test/net/dpml/metro/builder metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/data metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/data/test metro/part/api/src/main/net/dpml metro/part/api/src/main/net/dpml/component metro/part/content/src/main/net/dpml/part/content metro/part/test/src/test/net/dpml/test/part metro/runtime/src/main/net/dpml/metro/runtime metro/station/api/src/main/net/dpml/station metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl/src/main/net/dpml/http planet/http/test/src/test/net/dpml/http/test transit

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1196 - in trunk/main: . depot lang/module/etc metro/builder/src/main/net/dpml/metro/builder metro/builder/src/test/net/dpml/metro/builder metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/data metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/data/test metro/part/api/src/main/net/dpml metro/part/api/src/main/net/dpml/component metro/part/content/src/main/net/dpml/part/content metro/part/test/src/test/net/dpml/test/part metro/runtime/src/main/net/dpml/metro/runtime metro/station/api/src/main/net/dpml/station metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl/src/main/net/dpml/http planet/http/test/src/test/net/dpml/http/test transit

Chronological Thread  
    < Chronological >       < Thread >
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1196 - in trunk/main: . depot lang/module/etc metro/builder/src/main/net/dpml/metro/builder metro/builder/src/test/net/dpml/metro/builder metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/data metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/data/test metro/part/api/src/main/net/dpml metro/part/api/src/main/net/dpml/component metro/part/content/src/main/net/dpml/part/content metro/part/test/src/test/net/dpml/test/part metro/runtime/src/main/net/dpml/metro/runtime metro/station/api/src/main/net/dpml/station metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl/src/main/net/dpml/http planet/http/test/src/test/net/dpml/http/test transit
  • Date: Thu, 16 Mar 2006 22:18:12 +0100
Author: mcconnell
Date: 2006-03-16 22:17:56 +0100 (Thu, 16 Mar 2006)
New Revision: 1196

Added:
trunk/main/metro/part/api/src/main/net/dpml/component/
Removed:
trunk/main/metro/part/api/src/main/net/dpml/part/
Modified:
trunk/main/build.xml
trunk/main/depot/module.xml
trunk/main/lang/module/etc/module.xsd

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentWriter.java

trunk/main/metro/builder/src/test/net/dpml/metro/builder/LookupTestCase.java
trunk/main/metro/builder/src/test/net/dpml/metro/builder/PartsTestCase.java
trunk/main/metro/exec/src/main/net/dpml/metro/exec/AbstractAdapter.java
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ApplicationHandler.java
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelManager.java
trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
trunk/main/metro/model/src/main/net/dpml/metro/ContextModelManager.java
trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java
trunk/main/metro/model/src/main/net/dpml/metro/ValidationException.java
trunk/main/metro/model/src/main/net/dpml/metro/data/ComponentDirective.java
trunk/main/metro/model/src/main/net/dpml/metro/data/ContextDirective.java

trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java
trunk/main/metro/model/src/main/net/dpml/metro/data/FeatureDirective.java
trunk/main/metro/model/src/main/net/dpml/metro/data/LookupDirective.java
trunk/main/metro/model/src/main/net/dpml/metro/data/NullDirective.java
trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java
trunk/main/metro/model/src/main/net/dpml/metro/info/Composite.java
trunk/main/metro/model/src/main/net/dpml/metro/info/PartReference.java

trunk/main/metro/model/src/test/net/dpml/metro/data/test/ComponentDirectiveTestCase.java

trunk/main/metro/model/src/test/net/dpml/metro/data/test/PartReferenceTestCase.java
trunk/main/metro/part/api/src/main/net/dpml/component/ActivationPolicy.java

trunk/main/metro/part/api/src/main/net/dpml/component/BuilderRuntimeException.java
trunk/main/metro/part/api/src/main/net/dpml/component/Component.java

trunk/main/metro/part/api/src/main/net/dpml/component/ComponentNotFoundException.java
trunk/main/metro/part/api/src/main/net/dpml/component/ContextEvent.java
trunk/main/metro/part/api/src/main/net/dpml/component/ContextListener.java
trunk/main/metro/part/api/src/main/net/dpml/component/ControlException.java

trunk/main/metro/part/api/src/main/net/dpml/component/ControlRuntimeException.java
trunk/main/metro/part/api/src/main/net/dpml/component/Controller.java

trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContext.java

trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContextEvent.java

trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContextListener.java

trunk/main/metro/part/api/src/main/net/dpml/component/DelegationException.java
trunk/main/metro/part/api/src/main/net/dpml/component/Directive.java
trunk/main/metro/part/api/src/main/net/dpml/component/Disposable.java
trunk/main/metro/part/api/src/main/net/dpml/component/InitialContext.java

trunk/main/metro/part/api/src/main/net/dpml/component/LifecycleException.java

trunk/main/metro/part/api/src/main/net/dpml/component/LocalEventProducer.java
trunk/main/metro/part/api/src/main/net/dpml/component/Model.java
trunk/main/metro/part/api/src/main/net/dpml/component/ModelEvent.java
trunk/main/metro/part/api/src/main/net/dpml/component/ModelException.java
trunk/main/metro/part/api/src/main/net/dpml/component/ModelListener.java

trunk/main/metro/part/api/src/main/net/dpml/component/PartNotFoundException.java
trunk/main/metro/part/api/src/main/net/dpml/component/Provider.java
trunk/main/metro/part/api/src/main/net/dpml/component/Service.java

trunk/main/metro/part/api/src/main/net/dpml/component/ServiceNotFoundException.java

trunk/main/metro/part/api/src/main/net/dpml/component/UnknownPartException.java

trunk/main/metro/part/content/src/main/net/dpml/part/content/PartContentHandler.java

trunk/main/metro/part/test/src/test/net/dpml/test/part/PartLoadingTestCase.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerException.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerNotFoundException.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerRuntimeException.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
trunk/main/metro/station/api/src/main/net/dpml/station/Application.java
trunk/main/metro/station/api/src/main/net/dpml/station/Callback.java

trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java

trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/AppTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ArrayTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CategoriesTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DefaultComponentHandlerTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DisposalTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/HardCollectionPolicyTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/LifecycleTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/NullTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/PartsTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/SingletonProviderTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/StateTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/TransientProviderTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/WeakCollectionPolicyTestCase.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java

trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/EntryDataType.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
trunk/main/transit/module.xml
Log:
moving net.dpml.part to net.dpml.component

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/build.xml 2006-03-16 21:17:56 UTC (rev 1196)
@@ -228,7 +228,7 @@
<group title="Metro">
<package name="net.dpml.metro"/>
<package name="net.dpml.metro.*"/>
- <package name="net.dpml.part"/>
+ <package name="net.dpml.component"/>
<package name="net.dpml.part.*"/>
<package name="net.dpml.state"/>
<package name="net.dpml.state.*"/>
@@ -245,6 +245,7 @@
</group>
<group title="Transit">
<package name="net.dpml.lang"/>
+ <package name="net.dpml.part"/>
<package name="net.dpml.transit"/>
<package name="net.dpml.transit.*"/>
</group>

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/depot/module.xml 2006-03-16 21:17:56 UTC (rev 1196)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">

- <resource name="dpml-library">
+ <resource name="dpml-library" basedir="library">
<types>
<type id="jar"/>
</types>
@@ -76,7 +76,7 @@
</dependencies>
</project>

- <resource name="dpml-tools-builder">
+ <resource name="dpml-tools-builder" basedir="tools/builder">
<types>
<type id="jar"/>
<part:plugin alias="true" class="net.dpml.tools.impl.StandardBuilder"/>

Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-03-16 20:05:44 UTC (rev
1195)
+++ trunk/main/lang/module/etc/module.xsd 2006-03-16 21:17:56 UTC (rev
1196)
@@ -63,13 +63,12 @@
</sequence>
<attribute name="name" type="string" use="required"/>
<attribute name="version" type="string"/>
+ <attribute name="basedir" type="string"/>
</complexType>

<complexType name="ProjectType">
<complexContent>
- <extension base="this:ResourceType">
- <attribute name="basedir" type="string"/>
- </extension>
+ <extension base="this:ResourceType"/>
</complexContent>
</complexType>


Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -39,7 +39,7 @@
import net.dpml.part.DOM3DocumentBuilder;
import net.dpml.lang.BuilderException;
import net.dpml.part.PartDirective;
-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.ActivationPolicy;

import net.dpml.metro.data.ContextDirective;
import net.dpml.metro.data.CategoryDirective;

Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentWriter.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentWriter.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentWriter.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -51,8 +51,8 @@
import net.dpml.part.PartBuilder;
import net.dpml.lang.Type;

-import net.dpml.part.ActivationPolicy;
-import net.dpml.part.Directive;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.Directive;

import org.w3c.dom.Element;
import org.w3c.dom.TypeInfo;

Modified:
trunk/main/metro/builder/src/test/net/dpml/metro/builder/LookupTestCase.java
===================================================================
---
trunk/main/metro/builder/src/test/net/dpml/metro/builder/LookupTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/builder/src/test/net/dpml/metro/builder/LookupTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -25,7 +25,7 @@
import java.util.List;
import java.net.URI;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;
import net.dpml.lang.Value;

import net.dpml.metro.info.PartReference;

Modified:
trunk/main/metro/builder/src/test/net/dpml/metro/builder/PartsTestCase.java
===================================================================
---
trunk/main/metro/builder/src/test/net/dpml/metro/builder/PartsTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/builder/src/test/net/dpml/metro/builder/PartsTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -25,7 +25,7 @@
import java.util.List;
import java.net.URI;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;
import net.dpml.lang.Value;

import net.dpml.metro.info.PartReference;

Modified:
trunk/main/metro/exec/src/main/net/dpml/metro/exec/AbstractAdapter.java
===================================================================
--- trunk/main/metro/exec/src/main/net/dpml/metro/exec/AbstractAdapter.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/exec/src/main/net/dpml/metro/exec/AbstractAdapter.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -22,12 +22,12 @@
import java.rmi.server.UnicastRemoteObject;
import java.lang.reflect.InvocationTargetException;

-import net.dpml.part.Component;
-import net.dpml.part.ControlException;
-import net.dpml.part.Provider;
-import net.dpml.part.Service;
-import net.dpml.part.ServiceNotFoundException;
-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.Component;
+import net.dpml.component.ControlException;
+import net.dpml.component.Provider;
+import net.dpml.component.Service;
+import net.dpml.component.ServiceNotFoundException;
+import net.dpml.component.ActivationPolicy;

import net.dpml.lang.Logger;


Modified:
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ApplicationHandler.java
===================================================================
---
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ApplicationHandler.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ApplicationHandler.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -26,7 +26,7 @@
import java.util.Iterator;
import java.util.Set;

-import net.dpml.part.Component;
+import net.dpml.component.Component;

import net.dpml.station.Station;
import net.dpml.station.Callback;

Modified:
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
===================================================================
--- trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -29,28 +29,28 @@

import net.dpml.station.ApplicationException;

+import net.dpml.metro.ComponentModelManager;
+import net.dpml.metro.ContextModelManager;
import net.dpml.metro.info.EntryDescriptor;
import net.dpml.metro.data.ValueDirective;

-import net.dpml.part.ActivationPolicy;
-import net.dpml.part.ControlException;
-import net.dpml.part.ServiceNotFoundException;
-import net.dpml.part.Controller;
-import net.dpml.part.ControllerContext;
-import net.dpml.part.InitialContext;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
-import net.dpml.part.Model;
-import net.dpml.part.Service;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.ControlException;
+import net.dpml.component.ServiceNotFoundException;
+import net.dpml.component.Controller;
+import net.dpml.component.ControllerContext;
+import net.dpml.component.InitialContext;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;
+import net.dpml.component.Model;
+import net.dpml.component.Service;

-import net.dpml.metro.ComponentModelManager;
-import net.dpml.metro.ContextModelManager;
-
import net.dpml.configuration.Configurable;
import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfigurationBuilder;

import net.dpml.lang.Logger;
+
import net.dpml.transit.Repository;
import net.dpml.transit.Transit;


Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.net.URI;
import java.rmi.RemoteException;

-import net.dpml.part.Controller;
+import net.dpml.component.Controller;

/**
* The ComponentContext interface may be referenced by a component

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
import java.util.Map;

-import net.dpml.part.Component;
+import net.dpml.component.Component;

/**
* Local interface through which a component implementation may

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import java.rmi.RemoteException;

-import net.dpml.part.Model;
+import net.dpml.component.Model;

import net.dpml.metro.info.LifestylePolicy;
import net.dpml.metro.info.CollectionPolicy;

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelManager.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelManager.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentModelManager.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -22,7 +22,7 @@

import net.dpml.metro.info.CollectionPolicy;

-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.ActivationPolicy;

import net.dpml.lang.UnknownKeyException;


Modified: trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -22,7 +22,7 @@
import java.rmi.RemoteException;

import net.dpml.metro.info.EntryDescriptor;
-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

import net.dpml.lang.UnknownKeyException;


Modified:
trunk/main/metro/model/src/main/net/dpml/metro/ContextModelManager.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ContextModelManager.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ContextModelManager.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -22,7 +22,7 @@

import net.dpml.metro.info.PartReference;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

import net.dpml.lang.UnknownKeyException;


Modified: trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/PartsManager.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -18,7 +18,7 @@

package net.dpml.metro;

-import net.dpml.part.ControlException;
+import net.dpml.component.ControlException;

import net.dpml.lang.UnknownKeyException;


Modified:
trunk/main/metro/model/src/main/net/dpml/metro/ValidationException.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ValidationException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ValidationException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.io.Serializable;
import java.net.URI;

-import net.dpml.part.ModelException;
+import net.dpml.component.ModelException;

/**
* Exception that describes a series of validation issues.

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/ComponentDirective.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/data/ComponentDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/model/src/main/net/dpml/metro/data/ComponentDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,8 +21,8 @@
import net.dpml.metro.info.PartReference;
import net.dpml.metro.info.LifestylePolicy;
import net.dpml.metro.info.CollectionPolicy;
-import net.dpml.part.ActivationPolicy;
-import net.dpml.part.Directive;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.Directive;

import net.dpml.configuration.Configuration;


Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/ContextDirective.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/ContextDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/ContextDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import java.util.Arrays;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

import net.dpml.metro.info.PartReference;


Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -18,7 +18,7 @@

package net.dpml.metro.data;

-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.ActivationPolicy;
import net.dpml.metro.info.Composite;
import net.dpml.metro.info.PartReference;


Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/FeatureDirective.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/FeatureDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/FeatureDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -18,7 +18,7 @@

package net.dpml.metro.data;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

/**
* A <code>FeatureDirective</code> declares a context entry that is itself a
feature

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/LookupDirective.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/LookupDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/LookupDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import java.net.URI;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

/**
* A reference directive is a reference to a part within the enclosing part's

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/NullDirective.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/NullDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/NullDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -18,7 +18,7 @@

package net.dpml.metro.data;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

/**
* A <code>NullDirective</code> is used to mark a solution as resolved

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,7 +24,7 @@
import net.dpml.lang.Value;
import net.dpml.lang.Construct;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

/**
* A <code>ValueDirective</code> represents a single constructed argument
value. The directive

Modified: trunk/main/metro/model/src/main/net/dpml/metro/info/Composite.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/Composite.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/Composite.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@

import java.io.Serializable;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

/**
* Abstract base class for composite entities.

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/info/PartReference.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/PartReference.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/PartReference.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import java.io.Serializable;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;

/**
* A <code>PartReference</code> is a serializable object that contains a key
and

Modified:
trunk/main/metro/model/src/test/net/dpml/metro/data/test/ComponentDirectiveTestCase.java
===================================================================
---
trunk/main/metro/model/src/test/net/dpml/metro/data/test/ComponentDirectiveTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/model/src/test/net/dpml/metro/data/test/ComponentDirectiveTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -34,7 +34,7 @@
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;

-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.ActivationPolicy;

import net.dpml.lang.Category;


Modified:
trunk/main/metro/model/src/test/net/dpml/metro/data/test/PartReferenceTestCase.java
===================================================================
---
trunk/main/metro/model/src/test/net/dpml/metro/data/test/PartReferenceTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/model/src/test/net/dpml/metro/data/test/PartReferenceTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import net.dpml.metro.info.PartReference;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;
import net.dpml.metro.data.ValueDirective;

/**

Copied: trunk/main/metro/part/api/src/main/net/dpml/component (from rev 1195,
trunk/main/metro/part/api/src/main/net/dpml/part)

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ActivationPolicy.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ActivationPolicy.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ActivationPolicy.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import net.dpml.lang.Enum;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/BuilderRuntimeException.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/BuilderRuntimeException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/BuilderRuntimeException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified: trunk/main/metro/part/api/src/main/net/dpml/component/Component.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Component.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Component.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.lang.reflect.InvocationTargetException;
import java.rmi.Remote;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ComponentNotFoundException.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/ComponentNotFoundException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ComponentNotFoundException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ContextEvent.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ContextEvent.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/ContextEvent.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.util.EventObject;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ContextListener.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ContextListener.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ContextListener.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.rmi.Remote;
import java.rmi.RemoteException;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ControlException.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ControlException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ControlException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ControlRuntimeException.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/ControlRuntimeException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ControlRuntimeException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/Controller.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Controller.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Controller.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.io.IOException;
import java.net.URI;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContext.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ControllerContext.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContext.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.io.File;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContextEvent.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/ControllerContextEvent.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContextEvent.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.io.File;
import java.util.EventObject;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContextListener.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/ControllerContextListener.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ControllerContextListener.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.util.EventListener;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/DelegationException.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/DelegationException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/DelegationException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified: trunk/main/metro/part/api/src/main/net/dpml/component/Directive.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Directive.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Directive.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.io.Serializable;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/Disposable.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Disposable.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Disposable.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

/**
* Common interface implemented by disposable objects.

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/InitialContext.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/InitialContext.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/InitialContext.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.io.File;
import java.lang.reflect.Constructor;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/LifecycleException.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/LifecycleException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/LifecycleException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/LocalEventProducer.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/LocalEventProducer.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/LocalEventProducer.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.util.EventObject;
import java.util.EventListener;

Modified: trunk/main/metro/part/api/src/main/net/dpml/component/Model.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Model.java 2006-03-16
20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Model.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.rmi.Remote;
import java.rmi.RemoteException;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ModelEvent.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ModelEvent.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/ModelEvent.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.util.EventObject;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ModelException.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ModelException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/ModelException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ModelListener.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ModelListener.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/ModelListener.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.rmi.Remote;
import java.rmi.RemoteException;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/PartNotFoundException.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/PartNotFoundException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/PartNotFoundException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified: trunk/main/metro/part/api/src/main/net/dpml/component/Provider.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Provider.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Provider.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.rmi.Remote;
import java.rmi.RemoteException;

Modified: trunk/main/metro/part/api/src/main/net/dpml/component/Service.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/Service.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/part/api/src/main/net/dpml/component/Service.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.rmi.Remote;
import java.rmi.RemoteException;

Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/ServiceNotFoundException.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/ServiceNotFoundException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/ServiceNotFoundException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

import java.net.URI;


Modified:
trunk/main/metro/part/api/src/main/net/dpml/component/UnknownPartException.java
===================================================================
---
trunk/main/metro/part/api/src/main/net/dpml/part/UnknownPartException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/api/src/main/net/dpml/component/UnknownPartException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.part;
+package net.dpml.component;

/**
* Exception thrown when a component request an unknown part.

Modified:
trunk/main/metro/part/content/src/main/net/dpml/part/content/PartContentHandler.java
===================================================================
---
trunk/main/metro/part/content/src/main/net/dpml/part/content/PartContentHandler.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/content/src/main/net/dpml/part/content/PartContentHandler.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,11 +24,11 @@
import java.net.URL;
import java.io.IOException;

-import net.dpml.part.Directive;
-import net.dpml.part.Controller;
-import net.dpml.part.Model;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Directive;
+import net.dpml.component.Controller;
+import net.dpml.component.Model;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

/**
* URL content handler support the part datatype.

Modified:
trunk/main/metro/part/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
===================================================================
---
trunk/main/metro/part/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/part/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,9 +24,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Directive;
-import net.dpml.part.Controller;
-import net.dpml.part.InitialContext;
+import net.dpml.component.Directive;
+import net.dpml.component.Controller;
+import net.dpml.component.InitialContext;

import net.dpml.transit.DefaultTransitModel;
import net.dpml.transit.Transit;

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-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -47,11 +47,11 @@

import net.dpml.parameters.Parameters;

-import net.dpml.part.Directive;
-import net.dpml.part.ControlException;
-import net.dpml.part.Component;
-import net.dpml.part.Model;
-import net.dpml.part.ServiceNotFoundException;
+import net.dpml.component.Directive;
+import net.dpml.component.ControlException;
+import net.dpml.component.Component;
+import net.dpml.component.Model;
+import net.dpml.component.ServiceNotFoundException;

import net.dpml.lang.Version;
import net.dpml.lang.Category;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -34,18 +34,18 @@
import net.dpml.metro.data.ComponentDirective;
import net.dpml.metro.ComponentModel;

-import net.dpml.part.Controller;
-import net.dpml.part.ControlException;
-import net.dpml.part.DelegationException;
-import net.dpml.part.Directive;
+import net.dpml.component.Controller;
+import net.dpml.component.ControlException;
+import net.dpml.component.DelegationException;
+import net.dpml.component.Directive;
+import net.dpml.component.ControllerContext;
+import net.dpml.component.ControllerContextListener;
+import net.dpml.component.ControllerContextEvent;
+import net.dpml.component.Model;
+import net.dpml.component.Component;
+
import net.dpml.part.Part;
import net.dpml.part.PartBuilder;
-import net.dpml.part.ControllerContext;
-import net.dpml.part.ControllerContextListener;
-import net.dpml.part.ControllerContextEvent;
-import net.dpml.part.Model;
-import net.dpml.part.Component;
-
import net.dpml.part.PartHandler;
import net.dpml.part.StandardPartHandler;
import net.dpml.part.Strategy;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerException.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.ControlException;
+import net.dpml.component.ControlException;

/**
* Exception indicating an controller related error. A controller exception

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerNotFoundException.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerNotFoundException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerNotFoundException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import java.net.URI;

-import net.dpml.part.ControlException;
+import net.dpml.component.ControlException;

/**
* Exception thrown when an attempt is made to reference an unknown

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerRuntimeException.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerRuntimeException.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ControllerRuntimeException.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.ControlRuntimeException;
+import net.dpml.component.ControlRuntimeException;

/**
* Exception indicating an unexpected controller related runtime error. A
controller

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-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -46,24 +46,26 @@

import net.dpml.logging.Logger;

-import net.dpml.part.Controller;
-import net.dpml.part.Directive;
-import net.dpml.part.ActivationPolicy;
-import net.dpml.part.Disposable;
-import net.dpml.part.ControlException;
+import net.dpml.component.Controller;
+import net.dpml.component.Directive;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.Disposable;
+import net.dpml.component.ControlException;
+import net.dpml.component.ServiceNotFoundException;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;
+import net.dpml.component.Service;
+import net.dpml.component.ModelListener;
+import net.dpml.component.ModelEvent;
+import net.dpml.component.Model;
+
import net.dpml.lang.Version;
-import net.dpml.part.ServiceNotFoundException;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
-import net.dpml.part.Service;
-import net.dpml.part.ModelEvent;
-import net.dpml.part.ModelListener;
-
import net.dpml.lang.Classpath;
import net.dpml.lang.UnknownKeyException;

import net.dpml.state.State;

+
/**
* <p>Runtime handler for a component. The component handler maintains an
internal
* map of all instances derived from the component model based on the
LifestylePolicy

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -39,11 +39,12 @@
import net.dpml.metro.ComponentModelManager;
import net.dpml.metro.ContextModelManager;

-import net.dpml.part.Directive;
-import net.dpml.part.ActivationPolicy;
-import net.dpml.part.ControlException;
-import net.dpml.part.ModelListener;
-import net.dpml.part.ModelEvent;
+import net.dpml.component.Directive;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.ControlException;
+import net.dpml.component.ModelListener;
+import net.dpml.component.ModelEvent;
+import net.dpml.component.Model;

import net.dpml.configuration.Configuration;
import net.dpml.configuration.Configurable;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -37,10 +37,11 @@

import net.dpml.logging.Logger;

-import net.dpml.part.Directive;
-import net.dpml.part.ModelException;
-import net.dpml.part.ModelListener;
-import net.dpml.part.ModelEvent;
+import net.dpml.component.Directive;
+import net.dpml.component.ModelException;
+import net.dpml.component.ModelListener;
+import net.dpml.component.ModelEvent;
+import net.dpml.component.Model;

import net.dpml.lang.UnknownKeyException;


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-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -30,13 +30,13 @@
import net.dpml.metro.ComponentModelManager;
import net.dpml.metro.ComponentModel;

-import net.dpml.part.ActivationPolicy;
-import net.dpml.part.ControlException;
-import net.dpml.part.Component;
-import net.dpml.part.Model;
-import net.dpml.part.Service;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.ControlException;
+import net.dpml.component.Component;
+import net.dpml.component.Model;
+import net.dpml.component.Service;
+
import net.dpml.lang.Version;
-
import net.dpml.lang.UnknownKeyException;

/**

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -29,8 +29,8 @@

import net.dpml.logging.Logger;

-import net.dpml.part.Provider;
-import net.dpml.part.ControlException;
+import net.dpml.component.Provider;
+import net.dpml.component.ControlException;

import net.dpml.state.State;
import net.dpml.state.StateEvent;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -18,7 +18,7 @@

package net.dpml.metro.runtime;

-import net.dpml.part.Service;
+import net.dpml.component.Service;
import net.dpml.lang.Version;

/**

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-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -25,8 +25,8 @@

import net.dpml.metro.ComponentHandler;
import net.dpml.metro.PartsManager;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

/**
* Invoication handler for the Context inner class. The invocation handler
is

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -26,7 +26,7 @@

import net.dpml.logging.Logger;

-import net.dpml.part.Disposable;
+import net.dpml.component.Disposable;

/**
* A abstract base class that established an event queue and handles event
dispatch

Modified:
trunk/main/metro/station/api/src/main/net/dpml/station/Application.java
===================================================================
--- trunk/main/metro/station/api/src/main/net/dpml/station/Application.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/station/api/src/main/net/dpml/station/Application.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;

-import net.dpml.part.Provider;
+import net.dpml.component.Provider;

import net.dpml.lang.PID;


Modified: trunk/main/metro/station/api/src/main/net/dpml/station/Callback.java
===================================================================
--- trunk/main/metro/station/api/src/main/net/dpml/station/Callback.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/station/api/src/main/net/dpml/station/Callback.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -21,7 +21,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;

-import net.dpml.part.Component;
+import net.dpml.component.Component;

import net.dpml.lang.PID;


Modified:
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
===================================================================
---
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -45,7 +45,7 @@
import net.dpml.station.info.ApplicationDescriptor;
import net.dpml.station.server.RemoteApplicationRegistry;

-import net.dpml.part.Provider;
+import net.dpml.component.Provider;

import net.dpml.state.State;
import net.dpml.state.Operation;

Modified:
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
===================================================================
---
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -33,8 +33,8 @@
import net.dpml.station.info.StartupPolicy;
import net.dpml.station.info.ApplicationDescriptor;

-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.station.Callback;
import net.dpml.station.ProcessState;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/AppTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/AppTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/AppTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.app.Demo;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ArrayTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ArrayTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ArrayTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,9 +24,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.array.ArrayTestComponent;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CategoriesTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CategoriesTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CategoriesTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.categories.CategoriesComponent;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,8 +23,8 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.Controller;
+import net.dpml.component.ActivationPolicy;
import net.dpml.metro.info.LifestylePolicy;
import net.dpml.metro.info.CollectionPolicy;
import net.dpml.metro.ComponentModel;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,9 +24,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.metro.ComponentHandler;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,7 +24,7 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
+import net.dpml.component.Controller;

import net.dpml.metro.ComponentModelManager;
import net.dpml.metro.ContextModelManager;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,9 +24,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.ContextTestComponent;
import net.dpml.test.ContextTestComponent.Context;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DefaultComponentHandlerTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DefaultComponentHandlerTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DefaultComponentHandlerTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;


/**

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DisposalTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DisposalTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/DisposalTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Disposable;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Disposable;

/**
* Test clean disposal.

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/HardCollectionPolicyTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/HardCollectionPolicyTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/HardCollectionPolicyTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

/**
* Test HARD collection policy semantics.

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/LifecycleTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/LifecycleTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/LifecycleTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.lifecycle.StartableComponent;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/NullTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/NullTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/NullTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -20,7 +20,7 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
+import net.dpml.component.Controller;

/**
* Testing load launch time.

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,9 +24,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Component;
-import net.dpml.part.Controller;
-import net.dpml.part.Provider;
+import net.dpml.component.Component;
+import net.dpml.component.Controller;
+import net.dpml.component.Provider;

import net.dpml.metro.data.ValueDirective;
import net.dpml.metro.ComponentModel;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/PartsTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/PartsTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/PartsTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,9 +24,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.composite.ChildComponent;
import net.dpml.test.composite.PartsComponent;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -26,9 +26,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;
import net.dpml.state.State;
import net.dpml.state.StateListener;
import net.dpml.state.impl.DefaultStateListener;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/SingletonProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/SingletonProviderTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/SingletonProviderTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

/**
* Test singleton semantics.

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/StateTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/StateTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/StateTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

import net.dpml.test.state.Service;
import net.dpml.test.state.ManagedComponent.Monitor;

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/TransientProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/TransientProviderTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/TransientProviderTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

/**
* Test transient semantics.

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/WeakCollectionPolicyTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/WeakCollectionPolicyTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/WeakCollectionPolicyTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,9 +23,9 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.Component;
-import net.dpml.part.Provider;
+import net.dpml.component.Controller;
+import net.dpml.component.Component;
+import net.dpml.component.Provider;

/**
* Test WEAK collection semantics.

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -37,7 +37,7 @@
import net.dpml.metro.info.Type;
import net.dpml.metro.info.ContextDescriptor;
import net.dpml.metro.info.ServiceDescriptor;
-import net.dpml.part.Directive;
+import net.dpml.component.Directive;
import net.dpml.metro.data.ComponentDirective;

import net.dpml.transit.Transit;

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
===================================================================
---
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -28,7 +28,7 @@
import java.net.URISyntaxException;
import java.util.Properties;

-import net.dpml.part.Directive;
+import net.dpml.component.Directive;
import net.dpml.metro.data.ComponentDirective;
import net.dpml.metro.data.ContextDirective;
import net.dpml.metro.data.CategoriesDirective;
@@ -44,7 +44,7 @@

import net.dpml.parameters.Parameters;

-import net.dpml.part.ActivationPolicy;
+import net.dpml.component.ActivationPolicy;
import net.dpml.part.Part;
import net.dpml.part.PartBuilder;
import net.dpml.part.Strategy;

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/EntryDataType.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/EntryDataType.java
2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/EntryDataType.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,7 +23,7 @@

import net.dpml.metro.info.PartReference;
import net.dpml.metro.data.ValueDirective;
-import net.dpml.part.Directive;
+import net.dpml.component.Directive;
import net.dpml.metro.data.LookupDirective;
import net.dpml.metro.data.NullDirective;
import net.dpml.metro.data.FeatureDirective;

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-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -25,10 +25,10 @@
import net.dpml.metro.info.PartReference;
import net.dpml.metro.info.Type;

-import net.dpml.part.Directive;
-import net.dpml.part.DelegationException;
-import net.dpml.part.PartNotFoundException;
-import net.dpml.part.Controller;
+import net.dpml.component.Directive;
+import net.dpml.component.DelegationException;
+import net.dpml.component.PartNotFoundException;
+import net.dpml.component.Controller;

import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;

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-16 20:05:44 UTC (rev 1195)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -23,7 +23,7 @@

import net.dpml.metro.PartsManager;
import net.dpml.metro.ComponentHandler;
-import net.dpml.part.Provider;
+import net.dpml.component.Provider;

import org.mortbay.thread.ThreadPool;
import org.mortbay.jetty.RequestLog;

Modified:
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
===================================================================
---
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
2006-03-16 20:05:44 UTC (rev 1195)
+++
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
2006-03-16 21:17:56 UTC (rev 1196)
@@ -24,8 +24,8 @@

import junit.framework.TestCase;

-import net.dpml.part.Controller;
-import net.dpml.part.ControlException;
+import net.dpml.component.Controller;
+import net.dpml.component.ControlException;

import net.dpml.metro.PartsManager;
import net.dpml.metro.ComponentHandler;

Modified: trunk/main/transit/module.xml
===================================================================
--- trunk/main/transit/module.xml 2006-03-16 20:05:44 UTC (rev 1195)
+++ trunk/main/transit/module.xml 2006-03-16 21:17:56 UTC (rev 1196)
@@ -22,13 +22,13 @@
</dependencies>
</project>

- <resource name="dpml-transit-main">
+ <resource name="dpml-transit-main" basedir="core">
<types>
<type id="jar"/>
</types>
</resource>

- <resource name="dpml-transit-tools">
+ <resource name="dpml-transit-tools" basedir="tools">
<types>
<type id="jar"/>
</types>



  • r1196 - in trunk/main: . depot lang/module/etc metro/builder/src/main/net/dpml/metro/builder metro/builder/src/test/net/dpml/metro/builder metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/data metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/data/test metro/part/api/src/main/net/dpml metro/part/api/src/main/net/dpml/component metro/part/content/src/main/net/dpml/part/content metro/part/test/src/test/net/dpml/test/part metro/runtime/src/main/net/dpml/metro/runtime metro/station/api/src/main/net/dpml/station metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl/src/main/net/dpml/http planet/http/test/src/test/net/dpml/http/test transit, mcconnell at BerliOS, 03/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page