notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1956 - in development/laboratory/plus: . acme acme/src/main/acme test tools/block tools/component tools/component/src/main/net/dpml/metro/tools/builder tools/part tools/part/src/main/net/dpml/metro/tools/part

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1956 - in development/laboratory/plus: . acme acme/src/main/acme test tools/block tools/component tools/component/src/main/net/dpml/metro/tools/builder tools/part tools/part/src/main/net/dpml/metro/tools/part
Date: Sun, 06 Mar 2005 18:07:47 -0500

Author: mcconnell AT dpml.net
Date: Sat Mar 5 18:20:21 2005
New Revision: 1956

Modified:
development/laboratory/plus/acme/ (props changed)
development/laboratory/plus/acme/src/main/acme/WidgetComponent.java
development/laboratory/plus/index.xml
development/laboratory/plus/test/ (props changed)
development/laboratory/plus/test/build.xml
development/laboratory/plus/tools/block/ (props changed)
development/laboratory/plus/tools/block/build.xml
development/laboratory/plus/tools/component/ (props changed)
development/laboratory/plus/tools/component/build.xml

development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/ComponentPartHandler.java

development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/PartsDataType.java

development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/antlib.xml
development/laboratory/plus/tools/part/ (props changed)
development/laboratory/plus/tools/part/build.xml

development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/Part.java

development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/PartTask.java
Log:
Updating refs.

Modified: development/laboratory/plus/acme/src/main/acme/WidgetComponent.java
==============================================================================
--- development/laboratory/plus/acme/src/main/acme/WidgetComponent.java
(original)
+++ development/laboratory/plus/acme/src/main/acme/WidgetComponent.java Sat
Mar 5 18:20:21 2005
@@ -41,6 +41,7 @@
*/
public void prepare( Part parent ) throws BuildException
{
+ log( "class: " + getClas().getName() );
log( "initization with parent: " + parent );
}

Modified: development/laboratory/plus/index.xml
==============================================================================
--- development/laboratory/plus/index.xml (original)
+++ development/laboratory/plus/index.xml Sat Mar 5 18:20:21 2005
@@ -25,8 +25,8 @@

<project basedir="tools/part">
<info>
- <group>dpml/metro</group>
- <name>dpml-tools-part</name>
+ <group>dpml/metro/tools</group>
+ <name>dpml-metro-tools-part</name>
<type>jar</type>
</info>
<dependencies>
@@ -35,14 +35,25 @@
</dependencies>
</project>

+ <project basedir="tools/component">
+ <info>
+ <group>dpml/metro/tools</group>
+ <name>dpml-metro-tools-component</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-metro-tools-part"/>
+ </dependencies>
+ </project>
+
<project basedir="tools/block">
<info>
- <group>dpml/metro</group>
- <name>dpml-metro-block-builder</name>
+ <group>dpml/metro/tools</group>
+ <name>dpml-metro-tools-block</name>
<type>jar</type>
</info>
<dependencies>
- <include key="dpml-tools-part"/>
+ <include key="dpml-metro-tools-part"/>
</dependencies>
</project>

@@ -53,20 +64,19 @@
<type>jar</type>
</info>
<dependencies>
- <include key="dpml-tools-part"/>
+ <include key="dpml-metro-tools-part"/>
</dependencies>
</project>

<project basedir="test">
<info>
- <group>dpml/metro</group>
+ <group>dpml/metro/tools</group>
<name>dpml-tools-part-test</name>
<type>jar</type>
</info>
<dependencies>
- <include key="dpml-tools-part"/>
+ <include key="dpml-metro-tools-block"/>
<include key="acme-component-builder"/>
- <include key="dpml-metro-block-builder"/>
</dependencies>
</project>

Modified: development/laboratory/plus/test/build.xml
==============================================================================
--- development/laboratory/plus/test/build.xml (original)
+++ development/laboratory/plus/test/build.xml Sat Mar 5 18:20:21 2005
@@ -3,14 +3,14 @@
<project name="dpml-tools-part-test" default="test" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core"
- xmlns:m="plugin:dpml/metro/dpml-metro-component-builder">
+ xmlns:m="plugin:dpml/metro/tools/dpml-metro-tools-component">

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

<target name="init" depends="standard.init">
<x:property name="acme.uri" feature="plugin"
key="acme-component-builder"/>
- <x:property name="metro.tools" feature="plugin" key="dpml-tools-part"/>
- <transit:plugin uri="${metro.tools}"/>
+ <x:property name="metro.component" feature="plugin"
key="dpml-metro-tools-component"/>
+ <transit:plugin uri="${metro.component}"/>
</target>

<target name="test" depends="standard.test">

Modified: development/laboratory/plus/tools/block/build.xml
==============================================================================
--- development/laboratory/plus/tools/block/build.xml (original)
+++ development/laboratory/plus/tools/block/build.xml Sat Mar 5 18:20:21
2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-metro-block-builder" default="install" basedir="."
+<project name="dpml-metro-tools-block" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

@@ -8,7 +8,8 @@

<target name="package" depends="standard.package">
<x:export>
- <antlib resource="net/dpml/metro/block/antlib.xml"
urn="plugin:dpml/metro/dpml-metro-block-builder"/>
+ <antlib resource="net/dpml/metro/tools/block/antlib.xml"
+ urn="plugin:dpml/metro/tools/dpml-metro-tools-block"/>
</x:export>
</target>

Modified: development/laboratory/plus/tools/component/build.xml
==============================================================================
--- development/laboratory/plus/tools/component/build.xml (original)
+++ development/laboratory/plus/tools/component/build.xml Sat Mar 5
18:20:21 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-metro-component-builder" default="install" basedir="."
+<project name="dpml-metro-tools-component" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

@@ -8,7 +8,8 @@

<target name="package" depends="standard.package">
<x:export>
- <antlib resource="net/dpml/metro/tools/antlib.xml"
urn="plugin:dpml/metro/dpml-metro-component-builder"/>
+ <antlib resource="net/dpml/metro/tools/builder/antlib.xml"
+ urn="plugin:dpml/metro/tools/dpml-metro-tools-component"/>
</x:export>
</target>

Modified:
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/ComponentPartHandler.java
==============================================================================
---
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/ComponentPartHandler.java
(original)
+++
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/ComponentPartHandler.java
Sat Mar 5 18:20:21 2005
@@ -44,6 +44,7 @@
*/
public void prepare( Part parent ) throws BuildException
{
+ log( "class: " + getClas().getName() );
log( "initization with parent: " + parent );
Part[] parts = m_parts.getParts();
for( int i=0; i<parts.length; i++ )

Modified:
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/PartsDataType.java
==============================================================================
---
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/PartsDataType.java
(original)
+++
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/PartsDataType.java
Sat Mar 5 18:20:21 2005
@@ -16,11 +16,14 @@
* limitations under the License.
*/

-package net.dpml.metro.tools;
+package net.dpml.metro.tools.builder;

import java.util.List;
import java.util.LinkedList;

+import net.dpml.metro.tools.part.Part;
+import net.dpml.metro.tools.part.PartTask;
+
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Target;
import org.apache.tools.ant.ProjectHelper;
@@ -69,7 +72,7 @@
ClassLoader context = Thread.currentThread().getContextClassLoader();
try
{
- Thread.currentThread().setContextClassLoader(
Parts.class.getClassLoader() );
+ Thread.currentThread().setContextClassLoader(
getClass().getClassLoader() );
part = getProject().createDataType( urn );
return (Part) part;
}
@@ -127,12 +130,15 @@
* Add a standard part to the container.
* @param the part to add
*/
- public void addPart( Part part )
+ public void addPart( PartTask part )
{
m_parts.add( part );
System.out.println( "adding part: " + part );
part.setProject( getProject() );
- part.init();
+ if( part instanceof Task )
+ {
+ ((Task)part).init();
+ }
}

/**

Modified:
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/antlib.xml
==============================================================================
---
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/antlib.xml
(original)
+++
development/laboratory/plus/tools/component/src/main/net/dpml/metro/tools/builder/antlib.xml
Sat Mar 5 18:20:21 2005
@@ -1,5 +1,5 @@
<?xml version="1.0"?>

<antlib>
- <taskdef name="component"
classname="net.dpml.metro.tools.part.ComponentTaskHandler"/>
+ <taskdef name="component"
classname="net.dpml.metro.tools.builder.ComponentPartHandler"/>
</antlib>
\ No newline at end of file

Modified: development/laboratory/plus/tools/part/build.xml
==============================================================================
--- development/laboratory/plus/tools/part/build.xml (original)
+++ development/laboratory/plus/tools/part/build.xml Sat Mar 5 18:20:21
2005
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-tools-part" default="install" basedir="."
+<project name="dpml-metro-tools-part" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
- xmlns:x="plugin:dpml/magic/dpml-magic-core"
- xmlns:m="plugin:dpml/metro/dpml-metro-tools">
+ xmlns:x="plugin:dpml/magic/dpml-magic-core" >

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

<target name="package" depends="standard.package">
<x:export>
- <antlib resource="net/dpml/metro/tools/antlib.xml"
urn="plugin:dpml/metro/dpml-metro-tools"/>
+ <antlib resource="net/dpml/metro/tools/part/antlib.xml"
+ urn="plugin:dpml/metro/tools/dpml-metro-tools-part"/>
</x:export>
</target>

Modified:
development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/Part.java
==============================================================================
---
development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/Part.java
(original)
+++
development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/Part.java
Sat Mar 5 18:20:21 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.metro.tools;
+package net.dpml.metro.tools.part;

import java.io.File;
import java.net.URI;

Modified:
development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/PartTask.java
==============================================================================
---
development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/PartTask.java
(original)
+++
development/laboratory/plus/tools/part/src/main/net/dpml/metro/tools/part/PartTask.java
Sat Mar 5 18:20:21 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.metro.tools;
+package net.dpml.metro.tools.part;

import java.io.File;
import java.net.URI;

svn commit: r1956 - in development/laboratory/plus: . acme acme/src/main/acme test tools/block tools/component tools/component/src/main/net/dpml/metro/tools/builder tools/part tools/part/src/main/net/dpml/metro/tools/part, mcconnell, 03/06/2005