notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2387 - in development/main/metro: . composition composition/builder/src/main/net/dpml/composition/builder composition/builder/src/main/net/dpml/composition/builder/datatypes composition/control/src/main/net/dpml/composition/control composition/control/src/main/net/dpml/composition/models composition/info composition/part/src/main/net/dpml/composition/data composition/part/src/main/net/dpml/composition/info composition/part/src/test/net/dpml/composition/info/test

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2387 - in development/main/metro: . composition composition/builder/src/main/net/dpml/composition/builder composition/builder/src/main/net/dpml/composition/builder/datatypes composition/control/src/main/net/dpml/composition/control composition/control/src/main/net/dpml/composition/models composition/info composition/part/src/main/net/dpml/composition/data composition/part/src/main/net/dpml/composition/info composition/part/src/test/net/dpml/composition/info/test
Date: Sat, 23 Apr 2005 15:13:02 -0400

Author: mcconnell AT dpml.net
Date: Sat Apr 23 15:12:58 2005
New Revision: 2387

Removed:
development/main/metro/composition/info/
Modified:
development/main/metro/build.xml
development/main/metro/composition/build.xml

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java

development/main/metro/composition/part/src/main/net/dpml/composition/data/ComponentProfile.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/CategoryDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/ContextDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/DependencyDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/Descriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/EntryDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/InfoDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/PartDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/ReferenceDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/Service.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/ServiceDescriptor.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/Type.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/TypeHolder.java

development/main/metro/composition/part/src/main/net/dpml/composition/info/Version.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/AbstractDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/CategoryDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ContextDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/DependencyDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/EntryDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/InfoDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/PartDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ReferenceDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceDescriptorTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceTestCase.java

development/main/metro/composition/part/src/test/net/dpml/composition/info/test/TypeTestCase.java
development/main/metro/index.xml
Log:
merge ft meta info and meta data under the ft parts project

Modified: development/main/metro/build.xml
==============================================================================
--- development/main/metro/build.xml (original)
+++ development/main/metro/build.xml Sat Apr 23 15:12:58 2005
@@ -23,42 +23,4 @@

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

- <target name="patch">
- 
- <replace token="dpml-classic-api" value="dpml-classic-api" dir=".">
- <include name="**/*.xml"/>
- </replace>
- <replace token="dpml-classic-spi" value="dpml-classic-spi" dir=".">
- <include name="**/*.xml"/>
- </replace>
- <replace token="dpml-classic-impl" value="dpml-classic-impl" dir=".">
- <include name="**/*.xml"/>
- </replace>
- </target>
-
</project>

Modified: development/main/metro/composition/build.xml
==============================================================================
--- development/main/metro/composition/build.xml (original)
+++ development/main/metro/composition/build.xml Sat Apr 23 15:12:58
2005
@@ -5,4 +5,10 @@

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

+ <target name="patch">
+ <replace token="net.dpml.meta.info" value="net.dpml.composition.info"
dir=".">
+ <include name="**/*.java"/>
+ </replace>
+ </target>
+
</project>

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
Sat Apr 23 15:12:58 2005
@@ -52,10 +52,10 @@
import net.dpml.magic.model.Resource;
import net.dpml.magic.model.ResourceRef;
import net.dpml.magic.tasks.ProjectTask;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.InfoDescriptor;
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.TypeHolder;
+import net.dpml.composition.info.EntryDescriptor;
+import net.dpml.composition.info.InfoDescriptor;
+import net.dpml.composition.info.Type;
+import net.dpml.composition.info.TypeHolder;
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java
Sat Apr 23 15:12:58 2005
@@ -22,7 +22,7 @@
import java.beans.IntrospectionException;

import net.dpml.parts.part.PartReference;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

/**
* The contract for builders that create component part.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java
Sat Apr 23 15:12:58 2005
@@ -24,7 +24,7 @@

import net.dpml.parts.builder.Builder;

-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

/**
* The contract for builders that create component part.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java
Sat Apr 23 15:12:58 2005
@@ -34,15 +34,15 @@
import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfigurationBuilder;
import net.dpml.magic.tasks.ProjectTask;
-import net.dpml.meta.info.CategoryDescriptor;
-import net.dpml.meta.info.ContextDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.InfoDescriptor;
-import net.dpml.meta.info.PartDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.PartDescriptor.Operation;
+import net.dpml.composition.info.CategoryDescriptor;
+import net.dpml.composition.info.ContextDescriptor;
+import net.dpml.composition.info.DependencyDescriptor;
+import net.dpml.composition.info.EntryDescriptor;
+import net.dpml.composition.info.InfoDescriptor;
+import net.dpml.composition.info.PartDescriptor;
+import net.dpml.composition.info.ServiceDescriptor;
+import net.dpml.composition.info.Type;
+import net.dpml.composition.info.PartDescriptor.Operation;

import org.apache.tools.ant.BuildException;

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java
Sat Apr 23 15:12:58 2005
@@ -26,8 +26,8 @@

import net.dpml.magic.model.Policy;
import net.dpml.magic.tasks.ProjectTask;
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.TypeHolder;
+import net.dpml.composition.info.Type;
+import net.dpml.composition.info.TypeHolder;

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

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java
Sat Apr 23 15:12:58 2005
@@ -27,7 +27,7 @@
import net.dpml.composition.builder.ComponentBuilderTask;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.ContextDirective;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

import org.apache.tools.ant.Task;

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java
Sat Apr 23 15:12:58 2005
@@ -26,7 +26,7 @@
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.DependencyDirective;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

/**
* Dependecies data type

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java
Sat Apr 23 15:12:58 2005
@@ -27,9 +27,9 @@
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ValueDirective.Value;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.PartDescriptor;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.EntryDescriptor;
+import net.dpml.composition.info.PartDescriptor;
+import net.dpml.composition.info.Type;

/**
* A simple part datatype.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java
Sat Apr 23 15:12:58 2005
@@ -28,7 +28,7 @@
import net.dpml.parts.part.PartReference;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.control.CompositionPartHandler;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

import org.apache.tools.ant.BuildException;

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
Sat Apr 23 15:12:58 2005
@@ -26,7 +26,7 @@
import net.dpml.parts.part.PartReference;
import net.dpml.composition.builder.ComponentBuilderTask;
import net.dpml.composition.builder.PartReferenceBuilder;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

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

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java
Sat Apr 23 15:12:58 2005
@@ -26,7 +26,7 @@
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.ReferenceDirective;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

/**
* A simple part datatype.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java
Sat Apr 23 15:12:58 2005
@@ -35,8 +35,8 @@
import net.dpml.parts.control.HandlerNotFoundException;
import net.dpml.parts.control.DelegationException;

-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.TypeHolder;
+import net.dpml.composition.info.Type;
+import net.dpml.composition.info.TypeHolder;

import net.dpml.transit.TransitException;
import net.dpml.transit.artifact.Handler;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
Sat Apr 23 15:12:58 2005
@@ -43,7 +43,7 @@
import net.dpml.composition.management.ExecutableManager;
import net.dpml.composition.management.StartableManager;

-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.Type;

import net.dpml.logging.Logger;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
Sat Apr 23 15:12:58 2005
@@ -31,7 +31,7 @@

import net.dpml.composition.models.CompositionModel;

-import net.dpml.meta.info.PartDescriptor;
+import net.dpml.composition.info.PartDescriptor;

import net.dpml.parts.state.Manager;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
Sat Apr 23 15:12:58 2005
@@ -38,10 +38,10 @@
import net.dpml.configuration.Configurable;
import net.dpml.configuration.impl.DefaultConfiguration;

-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.DependencyDescriptor;
+import net.dpml.composition.info.EntryDescriptor;
+import net.dpml.composition.info.ServiceDescriptor;
+import net.dpml.composition.info.Type;

import net.dpml.parameters.Parameters;
import net.dpml.parameters.Parameterizable;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/data/ComponentProfile.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/data/ComponentProfile.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/data/ComponentProfile.java
Sat Apr 23 15:12:58 2005
@@ -22,7 +22,7 @@
import net.dpml.configuration.Configuration;
import net.dpml.lang.NullArgumentException;
import net.dpml.logging.data.CategoriesDirective;
-import net.dpml.meta.info.InfoDescriptor;
+import net.dpml.composition.info.InfoDescriptor;
import net.dpml.parameters.Parameters;

/**

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/CategoryDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/CategoryDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/CategoryDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.util.Properties;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/ContextDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/ContextDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/ContextDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.util.ArrayList;
import java.util.Arrays;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/DependencyDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/DependencyDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/DependencyDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.util.Properties;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/Descriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/Descriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/Descriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.io.Serializable;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/EntryDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/EntryDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/EntryDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.io.Serializable;
import java.beans.Introspector;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/InfoDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/InfoDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/InfoDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.util.Properties;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/PartDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/PartDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/PartDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.io.Serializable;
import java.lang.reflect.Method;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/ReferenceDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/ReferenceDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/ReferenceDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.io.Serializable;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/Service.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/Service.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/Service.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.util.Properties;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/ServiceDescriptor.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/ServiceDescriptor.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/ServiceDescriptor.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.util.Properties;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/Type.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/Type.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/Type.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.io.Serializable;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/TypeHolder.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/TypeHolder.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/TypeHolder.java
Sat Apr 23 15:12:58 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.net.URI;
import java.util.Arrays;

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/info/Version.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/info/Version.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/info/Version.java
Sat Apr 23 15:12:58 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.meta.info;
+package net.dpml.composition.info;

import java.io.Serializable;

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/AbstractDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/AbstractDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/AbstractDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,7 +26,7 @@
import java.util.Properties;

import junit.framework.TestCase;
-import net.dpml.meta.info.Descriptor;
+import net.dpml.composition.info.Descriptor;

/**
* AbstractDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/CategoryDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/CategoryDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/CategoryDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,10 +17,10 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

-import net.dpml.meta.info.Descriptor;
-import net.dpml.meta.info.CategoryDescriptor;
+import net.dpml.composition.info.Descriptor;
+import net.dpml.composition.info.CategoryDescriptor;

/**

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ContextDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ContextDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ContextDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,11 +17,11 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

-import net.dpml.meta.info.Descriptor;
-import net.dpml.meta.info.ContextDescriptor;
-import net.dpml.meta.info.EntryDescriptor;
+import net.dpml.composition.info.Descriptor;
+import net.dpml.composition.info.ContextDescriptor;
+import net.dpml.composition.info.EntryDescriptor;

/**
* ContextDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/DependencyDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/DependencyDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/DependencyDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,12 +17,12 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

-import net.dpml.meta.info.Descriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.Version;
+import net.dpml.composition.info.Descriptor;
+import net.dpml.composition.info.DependencyDescriptor;
+import net.dpml.composition.info.ReferenceDescriptor;
+import net.dpml.composition.info.Version;

/**
* DependencyDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/EntryDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/EntryDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/EntryDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

import java.io.File;
import java.io.FileInputStream;
@@ -28,7 +28,7 @@

import junit.framework.TestCase;

-import net.dpml.meta.info.EntryDescriptor;
+import net.dpml.composition.info.EntryDescriptor;

/**
* EntryDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/InfoDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/InfoDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/InfoDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,11 +17,11 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

-import net.dpml.meta.info.Descriptor;
-import net.dpml.meta.info.InfoDescriptor;
-import net.dpml.meta.info.Version;
+import net.dpml.composition.info.Descriptor;
+import net.dpml.composition.info.InfoDescriptor;
+import net.dpml.composition.info.Version;

/**
* InfoDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/PartDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/PartDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/PartDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

import java.io.File;
import java.io.FileInputStream;
@@ -28,8 +28,8 @@

import junit.framework.TestCase;

-import net.dpml.meta.info.PartDescriptor;
-import net.dpml.meta.info.PartDescriptor.Operation;
+import net.dpml.composition.info.PartDescriptor;
+import net.dpml.composition.info.PartDescriptor.Operation;

/**
* EntryDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ReferenceDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ReferenceDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ReferenceDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

import java.io.File;
import java.io.FileInputStream;
@@ -28,8 +28,8 @@

import junit.framework.TestCase;

-import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.Version;
+import net.dpml.composition.info.ReferenceDescriptor;
+import net.dpml.composition.info.Version;

/**

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceDescriptorTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceDescriptorTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceDescriptorTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,12 +17,12 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

-import net.dpml.meta.info.Descriptor;
-import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.Version;
+import net.dpml.composition.info.Descriptor;
+import net.dpml.composition.info.ReferenceDescriptor;
+import net.dpml.composition.info.ServiceDescriptor;
+import net.dpml.composition.info.Version;

/**
* ServiceDescriptorTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/ServiceTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,13 +17,13 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

-import net.dpml.meta.info.Descriptor;
-import net.dpml.meta.info.Service;
-import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.Version;
+import net.dpml.composition.info.Descriptor;
+import net.dpml.composition.info.Service;
+import net.dpml.composition.info.ReferenceDescriptor;
+import net.dpml.composition.info.EntryDescriptor;
+import net.dpml.composition.info.Version;

/**
* ServiceTestCase does XYZ

Modified:
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/TypeTestCase.java
==============================================================================
---
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/TypeTestCase.java
(original)
+++
development/main/metro/composition/part/src/test/net/dpml/composition/info/test/TypeTestCase.java
Sat Apr 23 15:12:58 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.meta.info.test;
+package net.dpml.composition.info.test;

import java.io.File;
import java.io.FileInputStream;
@@ -30,16 +30,16 @@

import junit.framework.TestCase;

-import net.dpml.meta.info.CategoryDescriptor;
-import net.dpml.meta.info.ContextDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.InfoDescriptor;
-import net.dpml.meta.info.ReferenceDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.PartDescriptor;
-import net.dpml.meta.info.PartDescriptor.Operation;
-import net.dpml.meta.info.Type;
+import net.dpml.composition.info.CategoryDescriptor;
+import net.dpml.composition.info.ContextDescriptor;
+import net.dpml.composition.info.DependencyDescriptor;
+import net.dpml.composition.info.EntryDescriptor;
+import net.dpml.composition.info.InfoDescriptor;
+import net.dpml.composition.info.ReferenceDescriptor;
+import net.dpml.composition.info.ServiceDescriptor;
+import net.dpml.composition.info.PartDescriptor;
+import net.dpml.composition.info.PartDescriptor.Operation;
+import net.dpml.composition.info.Type;

import net.dpml.configuration.Configuration;

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Sat Apr 23 15:12:58 2005
@@ -415,24 +415,6 @@



- <project basedir="composition/info">
- <info>
- <group>dpml/metro/private</group>
- <name>dpml-composition-info</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <types>
- <type>jar</type>
- </types>
- </info>
- <dependencies>
- <include key="dpml-parameters-api"/>
- <include key="dpml-configuration-api"/>
- <include key="dpml-configuration-impl" build="false" test="true"
runtime="false"/>
- <include key="dpml-parameters-impl" build="false" test="true"
runtime="false"/>
- </dependencies>
- </project>
-
<project basedir="composition/part">
<info>
<group>dpml/metro/private</group>
@@ -446,7 +428,6 @@
<dependencies>
<include key="dpml-parts-api"/>
<include key="dpml-transit-main"/>
- <include key="dpml-composition-info"/>
<include key="dpml-util-i18n"/>
<include key="dpml-configuration-api"/>
<include key="dpml-context-api"/>
@@ -474,11 +455,9 @@
<include key="dpml-transit-main" tag="api"/>
<include key="dpml-activity-api" tag="api"/>
<include key="dpml-parameters-api" tag="api"/>
- <include key="dpml-composition-info" tag="api"/>
<include key="dpml-configuration-api" tag="api"/>
<include key="dpml-parts-api" tag="spi"/>
<include key="dpml-composition-part" tag="spi"/>
- <include key="dpml-composition-info" tag="spi"/>
<include key="dpml-system-api" tag="spi"/>
<include key="dpml-util-exception"/>
<include key="dpml-parameters-impl"/>
@@ -498,7 +477,6 @@
</types>
</info>
<dependencies>
- <include key="dpml-composition-info"/>
<include key="dpml-parts-api"/>
<include key="dpml-magic-core"/>
<include key="dpml-logging-spi"/>

svn commit: r2387 - in development/main/metro: . composition composition/builder/src/main/net/dpml/composition/builder composition/builder/src/main/net/dpml/composition/builder/datatypes composition/control/src/main/net/dpml/composition/control composition/control/src/main/net/dpml/composition/models composition/info composition/part/src/main/net/dpml/composition/data composition/part/src/main/net/dpml/composition/info composition/part/src/test/net/dpml/composition/info/test, mcconnell, 04/23/2005