Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2005 - in development/laboratory/plus: . composition metro metro/builder metro/builder/src/main/net/dpml/composition/builder metro/control metro/control/src/main/net/dpml/composition/control metro/model

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2005 - in development/laboratory/plus: . composition metro metro/builder metro/builder/src/main/net/dpml/composition/builder metro/control metro/control/src/main/net/dpml/composition/control metro/model
  • Date: Thu, 10 Mar 2005 15:11:57 -0500

Author: mcconnell AT dpml.net
Date: Thu Mar 10 15:11:55 2005
New Revision: 2005

Added:
development/laboratory/plus/metro/
- copied from r2003, development/laboratory/plus/composition/
development/laboratory/plus/metro/build.xml
- copied unchanged from r2004,
development/laboratory/plus/composition/build.xml
development/laboratory/plus/metro/builder/
- copied from r2004, development/laboratory/plus/composition/builder/
development/laboratory/plus/metro/control/
- copied from r2004, development/laboratory/plus/composition/control/
development/laboratory/plus/metro/model/
- copied from r2004, development/laboratory/plus/composition/model/
Removed:
development/laboratory/plus/composition/
Modified:
development/laboratory/plus/index.xml

development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java

development/laboratory/plus/metro/control/src/main/net/dpml/composition/control/DefaultController.java
Log:


Modified: development/laboratory/plus/index.xml
==============================================================================
--- development/laboratory/plus/index.xml (original)
+++ development/laboratory/plus/index.xml Thu Mar 10 15:11:55 2005
@@ -96,10 +96,10 @@
</dependencies>
</project>

- <project basedir="composition/builder">
+ <project basedir="metro/builder">
<info>
<group>dpml/metro</group>
- <name>dpml-composition-builder</name>
+ <name>dpml-metro-builder</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -116,10 +116,10 @@
</dependencies>
</project>

- <project basedir="composition/model">
+ <project basedir="metro/model">
<info>
<group>dpml/metro</group>
- <name>dpml-composition-model</name>
+ <name>dpml-metro-model</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -131,10 +131,10 @@
</dependencies>
</project>

- <project basedir="composition/control">
+ <project basedir="metro/control">
<info>
<group>dpml/metro</group>
- <name>dpml-composition-control</name>
+ <name>dpml-metro-control</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -144,7 +144,7 @@
<dependencies>
<include key="dpml-metro-kernel-api"/>
<include key="dpml-metro-control-api"/>
- <include key="dpml-composition-model"/>
+ <include key="dpml-metro-model"/> <!-- good -->
</dependencies>
</project>

@@ -171,7 +171,7 @@
</types>
</info>
<dependencies>
- <include key="dpml-test-hello-api"/>
+ <include key="dpml-test-hello-api" tag="api"/>
</dependencies>
</project>

@@ -186,10 +186,10 @@
</types>
</info>
<dependencies>
- <include key="dpml-transit-main"/>
+ <include key="dpml-transit-main" test="true" runtime="false"/>
<include key="dpml-metro-kernel-impl" test="true" runtime="false"/>
- <include key="dpml-composition-builder" test="true" runtime="false"/>
- <include key="dpml-composition-control" test="true" runtime="false"/>
+ <include key="dpml-metro-builder" test="true" runtime="false"/> <!--
good -->
+ <include key="dpml-metro-control" test="true" runtime="false"/> <!--
good -->
<include key="dpml-test-hello-impl"/>
</dependencies>
</project>

Modified:
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
==============================================================================
---
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
(original)
+++
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
Thu Mar 10 15:11:55 2005
@@ -127,10 +127,17 @@

private ClassLoaderModel createClassLoaderModel()
{
+ URI[] apis = createURISequence( def, ResourceRef.API );
+ URI[] spis = createURISequence( def, ResourceRef.SPI );
+ URI[] impl = createURISequence( def, ResourceRef.IMPL );
+ return new ClassLoaderModel( apis, spis, impl );
+ }
+
+ private URI[] createURISequence( Definition def, int category )
+ {
ArrayList list = new ArrayList();
- Definition def = getDefinition();
final ResourceRef[] resources =
- def.getResourceRefs( getProject(), Policy.RUNTIME,
ResourceRef.ANY, true );
+ def.getResourceRefs( getProject(), Policy.RUNTIME, category, true
);
for( int i=0; i<resources.length; i++ )
{
final ResourceRef ref = resources[i];
@@ -141,14 +148,15 @@
if( "jar".equals( resource.getInfo().getType() ) )
{
URI uri = resource.getArtifactURI( "jar" );
+System.out.println( "# " + uri );
list.add( uri );
}
}
}
- URI[] uris = (URI[]) list.toArray( new URI[0] );
- return new ClassLoaderModel( uris );
+ return (URI[]) list.toArray( new URI[0] );
}

+
//--------------------------------------------------------------------
// Task
//--------------------------------------------------------------------

Modified:
development/laboratory/plus/metro/control/src/main/net/dpml/composition/control/DefaultController.java
==============================================================================
---
development/laboratory/plus/composition/control/src/main/net/dpml/composition/control/DefaultController.java
(original)
+++
development/laboratory/plus/metro/control/src/main/net/dpml/composition/control/DefaultController.java
Thu Mar 10 15:11:55 2005
@@ -68,6 +68,12 @@
return CONTROLLER_NAME;
}

+ /**
+ * Load an object using a supplied part as the defintion of
+ * the deployment criteria.
+ * @param part the part model defintion
+ * @exception Exception if an error occurs during loading
+ */
public void load( Part part ) throws Exception
{
if( part instanceof ComponentModel )



  • svn commit: r2005 - in development/laboratory/plus: . composition metro metro/builder metro/builder/src/main/net/dpml/composition/builder metro/control metro/control/src/main/net/dpml/composition/control metro/model, mcconnell, 03/10/2005

Archive powered by MHonArc 2.6.24.

Top of Page