Chronological Thread  

< Chronological >       < Thread >

---

Author: mcconnell
Date: 2007-03-18 19:49:29 +0100 (Sun, 18 Mar 2007)
New Revision: 1919

Added:
trunk/central/index.xml
trunk/release.bat
trunk/snapshot.bat
trunk/tutorials/components/context/project.xml
trunk/tutorials/components/examples/project.xml
trunk/tutorials/components/hello/project.xml
trunk/tutorials/components/lifestyle/project.xml
trunk/tutorials/components/logging/project.xml
trunk/tutorials/components/lookup/project.xml
trunk/tutorials/components/parts/project.xml
trunk/tutorials/components/profile/
trunk/tutorials/components/profile/etc/
trunk/tutorials/components/profile/etc/override.xml
trunk/tutorials/components/profile/etc/simple.xml
trunk/tutorials/components/profile/project.xml
trunk/tutorials/components/profile/src/
trunk/tutorials/components/profile/src/main/
trunk/tutorials/components/profile/src/main/org/
trunk/tutorials/components/profile/src/main/org/acme/
trunk/tutorials/components/profile/src/main/org/acme/profile/
trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.java
trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.xprofile
trunk/tutorials/components/profile/src/test/
trunk/tutorials/components/profile/src/test/org/
trunk/tutorials/components/profile/src/test/org/acme/
trunk/tutorials/components/profile/src/test/org/acme/profile/
trunk/tutorials/components/profile/src/test/org/acme/profile/test/

trunk/tutorials/components/profile/src/test/org/acme/profile/test/DemoTestCase.java
trunk/tutorials/components/singleton/project.xml
trunk/tutorials/components/state/project.xml
trunk/tutorials/components/thread/project.xml
trunk/tutorials/components/transient/project.xml
trunk/tutorials/index.xml
trunk/tutorials/tooling/alias/project.xml
trunk/tutorials/tooling/automation/project.xml
trunk/tutorials/tooling/complex/build/api/project.xml
trunk/tutorials/tooling/complex/build/impl/project.xml
trunk/tutorials/tooling/complex/export/module.xml
trunk/tutorials/tooling/complex/modules/module.xml
trunk/tutorials/tooling/complex/plugin/module.xml
trunk/tutorials/tooling/filters/project.xml
trunk/tutorials/tooling/imports/project.xml
trunk/tutorials/tooling/properties/project.xml
trunk/tutorials/tooling/symbolic/project.xml
trunk/tutorials/tooling/types/project.xml
trunk/tutorials/tooling/unit/project.xml
Removed:
trunk/tutorials/components/customize/
Modified:
trunk/central/module.xml
trunk/central/site/build.xml
trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
trunk/index.xml
trunk/main/build.xml
trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
trunk/tutorials/components/logging/src/main/org/acme/Demo.java
trunk/tutorials/module.xml
trunk/tutorials/tooling/alias/build.xml
trunk/tutorials/tooling/alias/index.xml
trunk/tutorials/tooling/automation/build.xml
trunk/tutorials/tooling/automation/index.xml
trunk/tutorials/tooling/complex/build/api/build.xml
trunk/tutorials/tooling/complex/export/index.xml
trunk/tutorials/tooling/complex/modules/
trunk/tutorials/tooling/complex/modules/index.xml
trunk/tutorials/tooling/complex/plugin/index.xml
trunk/tutorials/tooling/filters/index.xml
trunk/tutorials/tooling/imports/index.xml
trunk/tutorials/tooling/properties/index.xml
trunk/tutorials/tooling/symbolic/index.xml
trunk/tutorials/tooling/types/index.xml
trunk/tutorials/tooling/unit/index.xml
Log:
updating tutorials with new module namespace org/acme

Added: trunk/central/index.xml
===================================================================
--- trunk/central/index.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/central/index.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<index xmlns="dpml:library">
+
+ <imports>
+ <import uri="link:module:junit"/>
+ <import uri="link:module:org/apache/ant"/>
+ <import uri="link:module:dpml"/>
+ <import uri="link:module:org/acme"/>
+ </imports>
+
+ <properties>
+ <property name="project.javac.source" value="1.5"/>
+ <property name="project.javac.target" value="1.5"/>
+ <property name="project.javac.lint" value="unchecked"/>
+ <property name="project.publisher.name" value="Digital Product
Management Laboratory"/>
+ <property name="project.specification.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor-id" value="net.dpml"/>
+ <property name="project.publisher.url" value="http://www.dpml.net"/>
+ <property name="project.resource.host"
value="http://repository.dpml.net"/>
+ <property name="project.api.host" value="http://api.dpml.net"/>
+ <property name="project.svn.host"
value="svn://svn.berlios.de/dpml/trunk/main"/>
+ <property name="project.major.version" value="2"/>
+ <property name="project.minor.version" value="0"/>
+ <property name="project.micro.version" value="0"/>
+ <property name="project.javadoc.linksource" value="false"/>
+ </properties>
+
+ <module name="dpml">
+
+ <filters>
+ <filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
+ <filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
+ <feature token="PROJECT-VERSION" id="version"/>
+ </filters>
+
+ <module file="module.xml"/>
+
+ </module>
+
+</index>

Modified: trunk/central/module.xml
===================================================================
--- trunk/central/module.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/central/module.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -20,7 +20,6 @@
<project name="site" basedir="site">
<dependencies>
<build>
- <include ref="dpmlx/tutorials"/>
<include key="apis"/>
</build>
</dependencies>

Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/central/site/build.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -37,6 +37,7 @@
<mkdir dir="${docs.dir}"/>
<zip destfile="${docs.path}" duplicate="fail">
<zipfileset dir="target/docs" prefix="share/docs"/>
+ <zipfileset dir="../../main/target/docs/api" prefix="share/docs/api"/>
</zip>
<checksum file="${docs.path}" fileext=".md5"/>
</target>
@@ -55,7 +56,7 @@
</target>
-->

- <target name="site" depends="docs,javadoc,junit-report,checkstyle">
+ <target name="site" depends="docs,junit-report,checkstyle">
<x:docs dest="${dpml.data}/docs"/>
</target>

@@ -63,63 +64,6 @@
<x:docs dest="${dpml.data}/docs"/>
</target>

- <target name="javadoc" depends="init">
- <property name="api.path"
location="${basedir}/target/docs/api/dpml/${dpml.module.version}"/>
- <property name="javadoc.title" value="Digitial Product Management
Laboratory (DPML) - SDK ${dpml.module.version}"/>
- <mkdir dir="${api.path}"/>
- <x:javadoc title="${javadoc.title}"
- Windowtitle="${javadoc.title}"
- access="protected" ref="dpml"
- dest="${api.path}">
- <exclude name="dpml"/>
- <exclude name="org.acme"/>
- <link href="http://java.sun.com/javase/6/docs/api"/>
- <group title="Station">
- <package name="net.dpml.appliance"/>
- <package name="net.dpml.appliance.*"/>
- <package name="net.dpml.station"/>
- <package name="net.dpml.station.*"/>
- </group>
- <group title="Metro">
- <package name="net.dpml.annotation"/>
- <package name="net.dpml.lang"/>
- <package name="net.dpml.lang.*"/>
- <package name="net.dpml.runtime"/>
- <package name="net.dpml.runtime.*"/>
- <package name="net.dpml.state"/>
- </group>
- <group title="Utilities">
- <package name="net.dpml.transit"/>
- <package name="net.dpml.transit.*"/>
- <package name="net.dpml.util"/>
- </group>
- <group title="Depot">
- <package name="net.dpml.depot"/>
- <package name="net.dpml.depot.*"/>
- </group>
- <!--
- <group title="Metro">
- <package name="net.dpml.component"/>
- <package name="net.dpml.metro"/>
- <package name="net.dpml.metro.*"/>
- <package name="net.dpml.state"/>
- </group>
- <group title="Station">
- <package name="net.dpml.station"/>
- <package name="net.dpml.station.*"/>
- </group>
- <group title="Planet">
- <package name="net.dpml.http"/>
- <package name="net.dpml.http.*"/>
- </group>
- <group title="Util">
- <package name="dpml.cli"/>
- <package name="dpml.cli.*"/>
- </group>
- -->
- </x:javadoc>
- </target>
-
<target name="junit-report" depends="init">
<property name="junit.html"
location="${basedir}/target/docs/reports/${dpml.module.version}/junit"/>
<mkdir dir="${junit.html}"/>
@@ -154,9 +98,13 @@

<target name="tutorials.prepare" depends="standard.prepare">

+ <property name="central.dir" location="${basedir}/.."/>
+ <property name="tutorials.dir" location="${central.dir}/../tutorials"/>
+ <property name="tooling.dir" location="${tutorials.dir}/tooling"/>
+ <property name="components.dir" location="${tutorials.dir}/components"/>
+
<!-- tooling tutorial build content -->

- <x:property name="tooling.dir" feature="basedir"
ref="dpmlx/tutorials/tooling"/>
<property name="plugin.src.dir"
location="${tooling.dir}/complex/plugin"/>
<property name="local.plugin.docs.dir"
location="target/docs/depot/tutorials/plugin"/>
<mkdir dir="${local.plugin.docs.dir}"/>
@@ -168,8 +116,6 @@

<!-- component tutorial build content -->

- <x:property name="components.dir" feature="basedir"
ref="dpmlx/tutorials/components"/>
-
<property name="hello.src.dir" location="${components.dir}/hello"/>
<property name="local.hello.docs.dir"
location="target/docs/metro/tutorials/hello"/>
<mkdir dir="${local.hello.docs.dir}"/>

Modified: trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
2007-03-18 18:49:29 UTC (rev 1919)
@@ -130,8 +130,8 @@
</p>

<pre>URI uri = new Uri(
"artifact:part:org/acme/plugin/clock-impl#SNAPSHOT" );
-Part part = Part.load( uri );
-Clock clock = (Clock) part.getContent();
+URL url = uri.toURL();
+Clock clock = (Clock) url.getContent( new Class[]{ Clock.class } );
String timestamp = clock.getTimestamp();</pre>

</subsection>

Modified: trunk/index.xml
===================================================================
--- trunk/index.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/index.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -29,6 +29,7 @@
<properties>
<property name="java.util.logging.config.class" value="dpml"/>
<property name="project.javadoc.linksource" value="true"/>
+ <property name="project.javadoc.excludes" value="org/**,dpml/**"/>
</properties>

<types>
@@ -48,15 +49,19 @@
<module file="depot/module.xml"/>

</module>
-
+
+ <!--
<module name="dpmlx">
<filters>
<filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
<filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
<feature token="PROJECT-VERSION" id="version"/>
</filters>
+
<module file="tutorials/module.xml"/>
<module file="central/module.xml"/>
+
</module>
+ -->

</index>

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/main/build.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -212,7 +212,43 @@
</xslt>
</target>

+ <target name="javadoc" depends="init">
+ <property name="api.path"
location="${basedir}/target/docs/api/dpml/${project.version}"/>
+ <property name="javadoc.title" value="Digitial Product Management
Laboratory (DPML) - SDK ${project.version}"/>
+ <property name="project.javadoc.excludes" value="dpml,org"/>
+ <mkdir dir="${api.path}"/>
+ <x:javadoc title="${javadoc.title}"
+ Windowtitle="${javadoc.title}"
+ access="protected"
+ dest="${api.path}">
+ <link href="http://java.sun.com/javase/6/docs/api"/>
+ <group title="Station">
+ <package name="net.dpml.appliance"/>
+ <package name="net.dpml.appliance.*"/>
+ <package name="net.dpml.station"/>
+ <package name="net.dpml.station.*"/>
+ </group>
+ <group title="Metro">
+ <package name="net.dpml.annotation"/>
+ <package name="net.dpml.lang"/>
+ <package name="net.dpml.lang.*"/>
+ <package name="net.dpml.runtime"/>
+ <package name="net.dpml.runtime.*"/>
+ <package name="net.dpml.state"/>
+ </group>
+ <group title="Utilities">
+ <package name="net.dpml.transit"/>
+ <package name="net.dpml.transit.*"/>
+ <package name="net.dpml.util"/>
+ </group>
+ <group title="Depot">
+ <package name="net.dpml.depot"/>
+ <package name="net.dpml.depot.*"/>
+ </group>
+ </x:javadoc>
+ </target>

+ <!--
<target name="javadoc" depends="init">
<property name="title" value="DPML SDK Version: ${project.version}"/>
<x:javadoc title="${title}"
@@ -239,5 +275,6 @@
</group>
</x:javadoc>
</target>
+ -->

</project>

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/JavadocTask.java
2007-03-18 18:49:29 UTC (rev 1919)
@@ -217,7 +217,7 @@
return m_dest;
}
}
-
+
//-----------------------------------------------------------------------
// internal
//-----------------------------------------------------------------------
@@ -349,15 +349,18 @@
private String getPackageExcludes()
{
Resource resource = getResource();
- return getProperty( JAVADOC_EXCLUDES, null );
+ return getPackageExcludes( resource );
}
+
+ private String getPackageExcludes( Resource resource )
+ {
+ return resource.getProperty( JAVADOC_EXCLUDES, null );
+ }

private void addSourcePath( Resource resource, Javadoc javadoc, Path
source )
{
- String excludes = getPackageExcludes();
-
//
- // check for a classic src directory
+ // handle the target resource
//

if( null != resource.getBaseDir() )
@@ -370,6 +373,7 @@
final DirSet packages = new DirSet();
packages.setDir( src );
packages.setIncludes( "**/*" );
+ String excludes = getPackageExcludes( resource );
if( null != excludes )
{
packages.setExcludes( excludes );
@@ -378,6 +382,8 @@
}
}

+ // add providers
+
String path = resource.getResourcePath();
Resource[] providers = resource.getAggregatedProviders(
Scope.RUNTIME, true, false );
for( int i=0; i<providers.length; i++ )
@@ -399,7 +405,7 @@
final DirSet packages = new DirSet();
packages.setDir( src );
packages.setIncludes( "**/**" );
- //String excludes = getPackageExcludes( provider
);
+ String excludes = getPackageExcludes( provider );
if( null != excludes )
{
packages.setExcludes( excludes );

Modified: trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/main/depot/tools/src/main/dpml/tools/tasks/PackageTask.java
2007-03-18 18:49:29 UTC (rev 1919)
@@ -76,6 +76,15 @@
Resource resource = context.getResource();

Type[] types = resource.getTypes();
+ //if( types.length == 0 )
+ //{
+ // log( "build target ["
+ // + resource
+ // + "] in ["
+ // + resource.getBaseDir()
+ // + "] does not declare any type production rules" );
+ //}
+
for( Type type : types )
{
build( project, context, resource, type );
@@ -143,6 +152,7 @@
private void build( Project project, Context context, Resource resource,
Type type )
{
String id = type.getID();
+ log( "building artifact: " + id );
if( "jar".equals( id ) )
{
File base = context.getTargetClassesMainDirectory();

Added: trunk/release.bat
===================================================================
--- trunk/release.bat 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/release.bat 2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,54 @@
+@echo off
+
+REM rebuild.bat
+REM -------------
+REM
+REM Utility to execute the bootstrap and main build sequence
+REM
+REM Usage:
+REM ------
+REM
+REM rebuild
+REM
+
+
+REM
+REM execute the bootstrap build procedure
+REM
+
+CD ..\main
+CALL bootstrap
+POPD
+IF ERRORLEVEL 1 GOTO :exit
+
+REM
+REM execute the build of the runtime systems using the bootstrap artifacts
+REM
+
+CD ..\main
+CALL build clean install -decimal
+POPD
+IF ERRORLEVEL 1 GOTO :exit
+
+REM
+REM build the tutorials using the resources established from the general
system build
+REM
+
+CD ..\tutorials
+CALL build clean install
+POPD
+
+REM
+REM build the documentation
+REM
+
+CD ..\central
+CALL build clean install -decimal
+POPD
+
+GOTO :EOF
+
+:exit
+ECHO RELEASE PRODUCTION FAILED
+GOTO :EOF
+

Added: trunk/snapshot.bat
===================================================================
--- trunk/snapshot.bat 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/snapshot.bat 2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,54 @@
+@echo off
+
+REM snapshot.bat
+REM -------------
+REM
+REM Utility to execute the bootstrap and main build sequence with a snapshot
version
+REM
+REM Usage:
+REM ------
+REM
+REM rebuild
+REM
+
+
+REM
+REM execute the bootstrap build procedure
+REM
+
+CD ..\main
+CALL bootstrap
+POPD
+IF ERRORLEVEL 1 GOTO :exit
+
+REM
+REM execute the build of the runtime systems using the bootstrap artifacts
+REM
+
+CD ..\main
+CALL build clean install
+POPD
+IF ERRORLEVEL 1 GOTO :exit
+
+REM
+REM build the tutorials using the resources established from the general
system build
+REM
+
+CD ..\tutorials
+CALL build clean install
+POPD
+
+REM
+REM build the documentation
+REM
+
+CD ..\central
+CALL build clean install
+POPD
+
+GOTO :EOF
+
+:exit
+ECHO REBUILD FAILED
+GOTO :EOF
+

Added: trunk/tutorials/components/context/project.xml
===================================================================
--- trunk/tutorials/components/context/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/context/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="context">
+
+ <info title="DPML Metro Context Tutorial">
+ <description>Introduction to context semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="hello"/>
+ </build>
+ <test>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/examples/project.xml
===================================================================
--- trunk/tutorials/components/examples/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/examples/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="examples">
+
+ <info title="DPML Metro Context Examples">
+ <description>Examples of different context solutions.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="context"/>
+ </build>
+ <test>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/hello/project.xml
===================================================================
--- trunk/tutorials/components/hello/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/hello/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="hello">
+
+ <info title="DPML Metro Hello Tutorial">
+ <description>Introductory Hello World demo.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <test>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/lifestyle/project.xml
===================================================================
--- trunk/tutorials/components/lifestyle/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/lifestyle/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="lifestyle">
+
+ <info title="DPML Metro Lifestyle Tutorial">
+ <description>Tutorial dealing with lifestyle semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="lookup"/>
+ </build>
+ <runtime>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/logging/project.xml
===================================================================
--- trunk/tutorials/components/logging/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/logging/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="logging">
+
+ <info title="DPML Metro Logging Tutorial">
+ <description>Tutorial dealing with logging semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="state"/>
+ </build>
+ <runtime>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </runtime>
+ <test>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Modified: trunk/tutorials/components/logging/src/main/org/acme/Demo.java
===================================================================
--- trunk/tutorials/components/logging/src/main/org/acme/Demo.java
2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/tutorials/components/logging/src/main/org/acme/Demo.java
2007-03-18 18:49:29 UTC (rev 1919)
@@ -18,7 +18,7 @@

package org.acme;

-import net.dpml.logging.Logger;
+import net.dpml.util.Logger;

/**
* A minimal component.

Added: trunk/tutorials/components/lookup/project.xml
===================================================================
--- trunk/tutorials/components/lookup/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/lookup/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="lookup">
+
+ <info title="DPML Metro Service Lookup Tutorial">
+ <description>Example of a service lookup.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="parts"/>
+ </build>
+ <test>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/parts/project.xml
===================================================================
--- trunk/tutorials/components/parts/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/parts/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="parts">
+
+ <info title="DPML Metro Context Examples">
+ <description>Examples of different context solutions.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="examples"/>
+ </build>
+ <test>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+


Property changes on: trunk/tutorials/components/profile
___________________________________________________________________
Name: svn:ignore
+ target


Added: trunk/tutorials/components/profile/etc/override.xml
===================================================================
--- trunk/tutorials/components/profile/etc/override.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/profile/etc/override.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<component xmlns="dpml:metro" class="org.acme.profile.Demo" name="demo">
+ <context>
+ <entry key="firstName" value="Bruce"/>
+ <entry key="lastName" value="Wayne"/>
+ </context>
+</component>

Added: trunk/tutorials/components/profile/etc/simple.xml
===================================================================
--- trunk/tutorials/components/profile/etc/simple.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/profile/etc/simple.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<component xmlns="dpml:metro" class="org.acme.profile.Demo" name="demo"/>

Added: trunk/tutorials/components/profile/project.xml
===================================================================
--- trunk/tutorials/components/profile/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/profile/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="profile">
+
+ <info title="DPML Component Profile Tutorial">
+ <description>Demonstration of an embedded component deployment
profile.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" name="simple" test="true" source="target/simple.xml"/>
+ <type id="part" name="override" test="true"
source="target/override.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="logging"/>
+ </build>
+ <runtime>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.java
===================================================================
--- trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.java
2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.java
2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.acme.profile;
+
+import java.awt.Color;
+import java.io.File;
+import java.net.URI;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+/**
+ * A component with a context
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class Demo
+{
+ //------------------------------------------------------------------
+ // context
+ //------------------------------------------------------------------
+
+ /**
+ * Component driven context criteria.
+ */
+ public interface Context
+ {
+ /**
+ * Return an optional first name.
+ * @param value the default value
+ * @return the first name
+ */
+ String getFirstName( String value );
+
+ /**
+ * Return an optional surname.
+ * @return the surname
+ */
+ String getLastName( String value );
+ }
+
+ //------------------------------------------------------------------
+ // state
+ //------------------------------------------------------------------
+
+ private final String m_firstName;
+ private final String m_lastName;
+
+ //------------------------------------------------------------------
+ // constructor
+ //------------------------------------------------------------------
+
+ /**
+ * Creation of a new object using a supplied logging channel.
+ * @param logger the logging channel
+ * @param context the deployment context
+ * @exception Exception if an error occurs
+ */
+ public Demo( final Logger logger, final Context context ) throws
Exception
+ {
+ m_firstName = context.getFirstName( null );
+ m_lastName = context.getLastName( null );
+
+ if( logger.isLoggable( Level.INFO ) )
+ {
+ logger.info( "NAME: " + m_firstName + " " + m_lastName );
+ }
+ }
+
+ public String getFirstName()
+ {
+ return m_firstName;
+ }
+
+ public String getLastName()
+ {
+ return m_lastName;
+ }
+}

Added:
trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.xprofile
===================================================================
---
trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.xprofile
2007-03-18 11:49:10 UTC (rev 1918)
+++
trunk/tutorials/components/profile/src/main/org/acme/profile/Demo.xprofile
2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<!--
+Declaration of packaged defaults for the demo component.
+-->
+
+<profile xmlns="dpml:metro" lifestyle="singleton">
+ <context>
+ <entry key="firstName" value="Fred"/>
+ <entry key="lastName" value="Flintstone"/>
+ </context>
+</profile>
+

Added:
trunk/tutorials/components/profile/src/test/org/acme/profile/test/DemoTestCase.java
===================================================================
---
trunk/tutorials/components/profile/src/test/org/acme/profile/test/DemoTestCase.java
2007-03-18 11:49:10 UTC (rev 1918)
+++
trunk/tutorials/components/profile/src/test/org/acme/profile/test/DemoTestCase.java
2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2007 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.acme.profile.test;
+
+import java.io.File;
+import java.net.URI;
+
+import junit.framework.TestCase;
+
+import net.dpml.lang.Strategy;
+
+import org.acme.profile.Demo;
+
+/**
+ * Deployment of the demo component.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class DemoTestCase extends TestCase
+{
+ /**
+ * Test component deployment using the simple scenario under which
+ * no context info is declared - as such we should be picking up values
+ * declared in the packaged profile.
+ *
+ * @exception Exception if an error occurs
+ */
+ public void testSimpleScenario() throws Exception
+ {
+ URI uri = getPartURI( "simple.part" );
+ Strategy strategy = Strategy.load( uri );
+ Demo demo = strategy.getInstance( Demo.class );
+ assertEquals( "first", "Fred", demo.getFirstName() );
+ assertEquals( "first", "Flintstone", demo.getLastName() );
+ }
+
+ /**
+ * Test component deployment using a profile containing context
+ * entry value in which case we will override the default contained
+ * in the packaged profile.
+ *
+ * @exception Exception if an error occurs
+ */
+ public void testOverridingScenario() throws Exception
+ {
+ URI uri = getPartURI( "override.part" );
+ Strategy strategy = Strategy.load( uri );
+ Demo demo = strategy.getInstance( Demo.class );
+ assertEquals( "first", "Bruce", demo.getFirstName() );
+ assertEquals( "first", "Wayne", demo.getLastName() );
+ }
+
+ private URI getPartURI( String name ) throws Exception
+ {
+ File base = new File( System.getProperty( "project.test.dir" ) );
+ File file = new File( base, name );
+ return file.toURI();
+ }
+}

Added: trunk/tutorials/components/singleton/project.xml
===================================================================
--- trunk/tutorials/components/singleton/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/singleton/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="singleton">
+
+ <info title="DPML Metro Lifestyle Tutorial">
+ <description>Tutorial dealing with lifestyle semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="thread"/>
+ </build>
+ <runtime>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/state/project.xml
===================================================================
--- trunk/tutorials/components/state/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/state/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="state">
+
+ <info title="DPML Metro Lifecycle Tutorial">
+ <description>Tutorial dealing with lifecycle semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="singleton"/>
+ </build>
+ <runtime>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/thread/project.xml
===================================================================
--- trunk/tutorials/components/thread/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/thread/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="thread">
+
+ <info title="DPML Metro Lifestyle Tutorial">
+ <description>Tutorial dealing with lifestyle semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="transient"/>
+ </build>
+ <runtime>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/components/transient/project.xml
===================================================================
--- trunk/tutorials/components/transient/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/components/transient/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="transient">
+
+ <info title="DPML Metro Lifestyle Tutorial">
+ <description>Tutorial dealing with lifestyle semantics.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ <type id="part" source="target/component.xml"/>
+ </types>
+
+ <dependencies>
+ <build>
+ <include key="lifestyle"/>
+ </build>
+ <runtime>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
+

Added: trunk/tutorials/index.xml
===================================================================
--- trunk/tutorials/index.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/tutorials/index.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<index xmlns="dpml:library">
+
+ <imports>
+ <import uri="link:module:junit"/>
+ <import uri="link:module:org/apache/ant"/>
+ <import uri="link:module:dpml"/>
+ </imports>
+
+ <properties>
+ <property name="project.javac.source" value="1.5"/>
+ <property name="project.javac.target" value="1.5"/>
+ <property name="project.javac.lint" value="unchecked"/>
+ <property name="project.publisher.name" value="Digital Product
Management Laboratory"/>
+ <property name="project.specification.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor-id" value="net.dpml"/>
+ <property name="project.publisher.url" value="http://www.dpml.net"/>
+ <property name="project.resource.host"
value="http://repository.dpml.net"/>
+ <property name="project.api.host" value="http://api.dpml.net"/>
+ <property name="project.svn.host"
value="svn://svn.berlios.de/dpml/trunk/main"/>
+ <property name="project.major.version" value="2"/>
+ <property name="project.minor.version" value="0"/>
+ <property name="project.micro.version" value="0"/>
+ <property name="project.javadoc.linksource" value="false"/>
+ <property name="java.util.logging.config.class" value="dpml"/>
+ </properties>
+
+ <module name="org/acme" basedir=".">
+
+ <types>
+ <type id="module" alias="true"/>
+ </types>
+
+ <!-- tutorials dealing with tooling -->
+
+ <project name="simple" basedir="tooling/simple"/>
+ <project file="tooling/properties/project.xml"/>
+ <project file="tooling/symbolic/project.xml"/>
+ <project file="tooling/filters/project.xml"/>
+ <project file="tooling/types/project.xml"/>
+ <project file="tooling/automation/project.xml"/>
+ <project file="tooling/alias/project.xml"/>
+ <project file="tooling/unit/project.xml"/>
+ <project file="tooling/imports/project.xml"/>
+ <project file="tooling/complex/build/api/project.xml"/>
+ <project file="tooling/complex/build/impl/project.xml"/>
+ <module file="tooling/complex/modules/module.xml"/>
+ <module file="tooling/complex/export/module.xml"/>
+ <module file="tooling/complex/plugin/module.xml"/>
+
+ <!-- metro tutorials -->
+
+ <project file="components/hello/project.xml"/>
+ <project file="components/context/project.xml"/>
+ <project file="components/examples/project.xml"/>
+ <project file="components/parts/project.xml"/>
+ <project file="components/lookup/project.xml"/>
+ <project file="components/lifestyle/project.xml"/>
+ <project file="components/transient/project.xml"/>
+ <project file="components/thread/project.xml"/>
+ <project file="components/singleton/project.xml"/>
+ <project file="components/state/project.xml"/>
+ <project file="components/logging/project.xml"/>
+ <project file="components/profile/project.xml"/>
+
+ </module>
+
+</index>

Modified: trunk/tutorials/module.xml
===================================================================
--- trunk/tutorials/module.xml 2007-03-18 11:49:10 UTC (rev 1918)
+++ trunk/tutorials/module.xml 2007-03-18 18:49:29 UTC (rev 1919)
@@ -216,7 +216,9 @@
</test>
</dependencies>
</project>
-
+
+ <project file="profile/project.xml"/>
+
</module>

</module>
\ No newline at end of file

Modified: trunk/tutorials/tooling/alias/build.xml
===================================================================
--- trunk/tutorials/tooling/alias/build.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/alias/build.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="demo" default="install"
- xmlns:transit="antlib:dpml.tools.transit">
+<project name="demo" default="install" xmlns:x="antlib:dpml.tools">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/tools/standard"/>

</project>

Modified: trunk/tutorials/tooling/alias/index.xml
===================================================================
--- trunk/tutorials/tooling/alias/index.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/alias/index.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello from ${user.name} in
${location}"/>
- </properties>
- <types>
- <type id="jar" alias="true"/>
- </types>
- <filters>
- <filter token="MESSAGE" value="${message}"/>
- </filters>
- </project>
+ <project file="project.xml"/>

</index>

Added: trunk/tutorials/tooling/alias/project.xml
===================================================================
--- trunk/tutorials/tooling/alias/project.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/alias/project.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="alias">
+
+ <info title="DPML Library Alias Tutorial">
+ <description>Demonstration of the alias attributes in a type production
statement.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello from ${user.name} in ${location}"/>
+ </properties>
+
+ <types>
+ <type id="jar" alias="true"/>
+ </types>
+
+ <filters>
+ <filter token="MESSAGE" value="${message}"/>
+ </filters>
+
+</project>
+

Modified: trunk/tutorials/tooling/automation/build.xml
===================================================================
--- trunk/tutorials/tooling/automation/build.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/automation/build.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="demo" default="install"
- xmlns:transit="antlib:dpml.tools.transit">
+<project name="demo" default="install" xmlns:x="antlib:dpml.tools">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/tools/standard"/>

</project>

Modified: trunk/tutorials/tooling/automation/index.xml
===================================================================
--- trunk/tutorials/tooling/automation/index.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/automation/index.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello from ${user.name} in
${location}"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- <filters>
- <filter token="MESSAGE" value="${message}"/>
- </filters>
- </project>
+ <project file="project.xml"/>

</index>

Added: trunk/tutorials/tooling/automation/project.xml
===================================================================
--- trunk/tutorials/tooling/automation/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/automation/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="automation">
+
+ <info title="DPML Library Build Automation Tutorial">
+ <description>Demonstration of Depot build automation
capabilities.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello from ${user.name} in ${location}"/>
+ </properties>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+ <filters>
+ <filter token="MESSAGE" value="${message}"/>
+ </filters>
+
+</project>
+

Modified: trunk/tutorials/tooling/complex/build/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/build/api/build.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/build/api/build.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="demo" default="install"
- xmlns:transit="antlib:dpml.tools.transit">
+ xmlns:x="antlib:dpml.tools">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/tools/standard"/>

</project>

Added: trunk/tutorials/tooling/complex/build/api/project.xml
===================================================================
--- trunk/tutorials/tooling/complex/build/api/project.xml 2007-03-18
11:49:10 UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/build/api/project.xml 2007-03-18
18:49:29 UTC (rev 1919)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="clock-api">
+
+ <info title="DPML Multi-project Tutorial">
+ <description>Simple project containing an API that will be referenced by
an another project.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+</project>
+

Added: trunk/tutorials/tooling/complex/build/impl/project.xml
===================================================================
--- trunk/tutorials/tooling/complex/build/impl/project.xml 2007-03-18
11:49:10 UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/build/impl/project.xml 2007-03-18
18:49:29 UTC (rev 1919)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="clock-impl">
+
+ <info title="DPML Multi-project Tutorial">
+ <description>Implementation project that references a
dependency.</description>
+ </info>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+ <dependencies>
+ <runtime>
+ <include key="clock-api"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </test>
+ </dependencies>
+
+</project>
+

Modified: trunk/tutorials/tooling/complex/export/index.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/index.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/export/index.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -7,32 +7,7 @@
</imports>

<module name="org/acme" basedir=".">
-
- <types>
- <type id="module" version="1.0"/>
- </types>
-
- <project name="clock-api" basedir="api">
- <types>
- <type id="jar"/>
- </types>
- </project>
-
- <project name="clock-impl" basedir="impl">
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <runtime>
- <include key="clock-api"/>
- </runtime>
- <test>
- <include ref="org/apache/ant/ant-junit"/>
- <include ref="dpml/transit/dpml-transit-main"/>
- </test>
- </dependencies>
- </project>
-
+ <module file="module.xml"/>
</module>

</index>

Added: trunk/tutorials/tooling/complex/export/module.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/module.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/export/module.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<module xmlns="dpml:library" name="clock-bis" basedir=".">
+
+ <types>
+ <type id="module" version="1.0"/>
+ </types>
+
+ <project name="clock-api" basedir="api">
+ <types>
+ <type id="jar"/>
+ </types>
+ </project>
+
+ <project name="clock-impl" basedir="impl">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="clock-api"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </test>
+ </dependencies>
+ </project>
+
+</module>
+


Property changes on: trunk/tutorials/tooling/complex/modules
___________________________________________________________________
Name: svn:ignore
+ target


Modified: trunk/tutorials/tooling/complex/modules/index.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/index.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/modules/index.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -7,28 +7,7 @@
</imports>

<module name="org/acme" basedir=".">
-
- <project name="clock-api" basedir="api">
- <types>
- <type id="jar"/>
- </types>
- </project>
-
- <project name="clock-impl" basedir="impl">
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <runtime>
- <include key="clock-api"/>
- </runtime>
- <test>
- <include ref="org/apache/ant/ant-junit"/>
- <include ref="dpml/transit/dpml-transit-main"/>
- </test>
- </dependencies>
- </project>
-
+ <module file="module.xml"/>
</module>

</index>

Added: trunk/tutorials/tooling/complex/modules/module.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/module.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/modules/module.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<module xmlns="dpml:library" name="clock" basedir=".">
+
+ <types>
+ <type id="module" version="1.0"/>
+ </types>
+
+ <project name="clock-api" basedir="api">
+ <types>
+ <type id="jar"/>
+ </types>
+ </project>
+
+ <project name="clock-impl" basedir="impl">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="clock-api"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </test>
+ </dependencies>
+ </project>
+
+</module>
+

Modified: trunk/tutorials/tooling/complex/plugin/index.xml
===================================================================
--- trunk/tutorials/tooling/complex/plugin/index.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/plugin/index.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -6,30 +6,6 @@
<import uri="link:module:dpml"/>
</imports>

- <module name="org/acme/plugin" basedir=".">
+ <module file="module.xml"/>

- <project name="clock-api" basedir="api">
- <types>
- <type id="jar"/>
- </types>
- </project>
-
- <project name="clock-impl" basedir="impl">
- <types>
- <type id="jar"/>
- <type id="part" source="target/plugin.xml"/>
- </types>
- <dependencies>
- <runtime>
- <include key="clock-api"/>
- <include ref="dpml/metro/dpml-metro-part"/>
- </runtime>
- <test>
- <include ref="org/apache/ant/ant-junit"/>
- </test>
- </dependencies>
- </project>
-
- </module>
-
</index>

Added: trunk/tutorials/tooling/complex/plugin/module.xml
===================================================================
--- trunk/tutorials/tooling/complex/plugin/module.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/complex/plugin/module.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<module xmlns="dpml:library" name="plugin" basedir=".">
+
+ <types>
+ <type id="module" version="1.0"/>
+ </types>
+
+ <project name="clock-api" basedir="api">
+ <types>
+ <type id="jar"/>
+ </types>
+ </project>
+
+ <project name="clock-impl" basedir="impl">
+ <types>
+ <type id="jar"/>
+ <type id="part" source="etc/plugin.xml"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="clock-api"/>
+ </runtime>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ <include ref="dpml/metro/dpml-metro-part"/>
+ </test>
+ </dependencies>
+ </project>
+
+</module>
+

Modified: trunk/tutorials/tooling/filters/index.xml
===================================================================
--- trunk/tutorials/tooling/filters/index.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/filters/index.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello from ${user.name} in
${location}"/>
- </properties>
- <filters>
- <filter token="MESSAGE" value="${message}"/>
- </filters>
- </project>
+ <project file="project.xml"/>

</index>

Added: trunk/tutorials/tooling/filters/project.xml
===================================================================
--- trunk/tutorials/tooling/filters/project.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/filters/project.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="filters">
+
+ <info title="DPML Filter Tutorial">
+ <description>Demonstration of build phase filters in a project
definition.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello from ${user.name} in ${location}"/>
+ </properties>
+
+ <filters>
+ <filter token="MESSAGE" value="${message}"/>
+ </filters>
+
+</project>
+

Modified: trunk/tutorials/tooling/imports/index.xml
===================================================================
--- trunk/tutorials/tooling/imports/index.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/imports/index.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -6,23 +6,6 @@
<import uri="link:module:dpml"/>
</imports>

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello from ${user.name} in
${location}"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <test>
- <include ref="org/apache/ant/ant-junit"/>
- <include ref="dpml/transit/dpml-transit-main"/>
- </test>
- </dependencies>
- <filters>
- <filter token="MESSAGE" value="${message}"/>
- </filters>
- </project>
-
+ <project file="project.xml"/>
+
</index>

Added: trunk/tutorials/tooling/imports/project.xml
===================================================================
--- trunk/tutorials/tooling/imports/project.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/imports/project.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="imports">
+
+ <info title="DPML Import Tutorial">
+ <description>Demonstrating the usage of import statements in an index
file.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello from ${user.name} in ${location}"/>
+ </properties>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+ <dependencies>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </test>
+ </dependencies>
+
+ <filters>
+ <filter token="MESSAGE" value="${message}"/>
+ </filters>
+
+</project>
+

Modified: trunk/tutorials/tooling/properties/index.xml
===================================================================
--- trunk/tutorials/tooling/properties/index.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/properties/index.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="message" value="Hello"/>
- </properties>
- </project>
-
+ <project file="project.xml"/>
+
</index>

Added: trunk/tutorials/tooling/properties/project.xml
===================================================================
--- trunk/tutorials/tooling/properties/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/properties/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="properties">
+
+ <info title="DPML Properties Tutorial">
+ <description>Demonstrating the usage of properties in a project
definition.</description>
+ </info>
+
+ <properties>
+ <property name="message" value="Hello"/>
+ </properties>
+
+</project>
+

Modified: trunk/tutorials/tooling/symbolic/index.xml
===================================================================
--- trunk/tutorials/tooling/symbolic/index.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/symbolic/index.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello for ${user.name} in
${location}"/>
- </properties>
- </project>
-
+ <project file="project.xml"/>
+
</index>

Added: trunk/tutorials/tooling/symbolic/project.xml
===================================================================
--- trunk/tutorials/tooling/symbolic/project.xml 2007-03-18 11:49:10
UTC (rev 1918)
+++ trunk/tutorials/tooling/symbolic/project.xml 2007-03-18 18:49:29
UTC (rev 1919)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="symbolic">
+
+ <info title="DPML Symbolic Properties Tutorial">
+ <description>Demonstrating the usage of symbolic properties in a project
definition.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello for ${user.name} in ${location}"/>
+ </properties>
+
+</project>
+

Modified: trunk/tutorials/tooling/types/index.xml
===================================================================
--- trunk/tutorials/tooling/types/index.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/types/index.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello from ${user.name} in
${location}"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- <filters>
- <filter token="MESSAGE" value="${message}"/>
- </filters>
- </project>
-
+ <project file="project.xml"/>
+
</index>

Added: trunk/tutorials/tooling/types/project.xml
===================================================================
--- trunk/tutorials/tooling/types/project.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/types/project.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="types">
+
+ <info title="DPML Symbolic Properties Tutorial">
+ <description>Demonstrating the usage of system and type production
properties.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello from ${user.name} in ${location}"/>
+ </properties>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+ <filters>
+ <filter token="MESSAGE" value="${message}"/>
+ </filters>
+
+</project>
+

Modified: trunk/tutorials/tooling/unit/index.xml
===================================================================
--- trunk/tutorials/tooling/unit/index.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/unit/index.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -1,24 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="dpml:library">

- <project name="demo" basedir=".">
- <properties>
- <property name="location" value="New York"/>
- <property name="message" value="Hello from ${user.name} in
${location}"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <test>
- <include uri="artifact:jar:org/apache/ant/ant#1.7.0"/>
- <include uri="artifact:jar:org/apache/ant/ant-junit#1.7.0"/>
- <include uri="artifact:jar:junit/junit#4.2"/>
- </test>
- </dependencies>
- <filters>
- <filter token="MESSAGE" value="${message}"/>
- </filters>
- </project>
+ <project file="project.xml">

</index>

Added: trunk/tutorials/tooling/unit/project.xml
===================================================================
--- trunk/tutorials/tooling/unit/project.xml 2007-03-18 11:49:10 UTC (rev
1918)
+++ trunk/tutorials/tooling/unit/project.xml 2007-03-18 18:49:29 UTC (rev
1919)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="dpml:library" name="unit">
+
+ <info title="DPML Unit Testing Tutorial">
+ <description>Demonstrating the automation of unit tests.</description>
+ </info>
+
+ <properties>
+ <property name="location" value="New York"/>
+ <property name="message" value="Hello from ${user.name} in ${location}"/>
+ </properties>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+ <dependencies>
+ <test>
+ <include uri="artifact:jar:org/apache/ant/ant#1.7.0"/>
+ <include uri="artifact:jar:org/apache/ant/ant-junit#1.7.0"/>
+ <include uri="artifact:jar:junit/junit#4.2"/>
+ </test>
+ </dependencies>
+
+ <filters>
+ <filter token="MESSAGE" value="${message}"/>
+ </filters>
+
+</project>
+

---

• r1919 - in trunk: . central central/site central/site/src/docs/util/depot/tutorials main main/depot/tools/src/main/dpml/tools/tasks tutorials tutorials/components tutorials/components/context tutorials/components/examples tutorials/components/hello tutorials/components/lifestyle tutorials/components/logging tutorials/components/logging/src/main/org/acme tutorials/components/lookup tutorials/components/parts tutorials/components/profile tutorials/components/profile/etc tutorials/components/profile/src tutorials/components/profile/src/main tutorials/components/profile/src/main/org tutorials/components/profile/src/main/org/acme tutorials/components/profile/src/main/org/acme/profile tutorials/components/profile/src/test tutorials/components/profile/src/test/org tutorials/components/profile/src/test/org/acme tutorials/components/profile/src/test/org/acme/profile tutorials/components/profile/src/test/org/acme/profile/test tutorials/components/singleton tutorials/component! s/state tutorials/components/thread tutorials/components/transient tutorials/tooling/alias tutorials/tooling/automation tutorials/tooling/complex/build/api tutorials/tooling/complex/build/impl tutorials/tooling/complex/export tutorials/tooling/complex/modules tutorials/tooling/complex/plugin tutorials/tooling/filters tutorials/tooling/imports tutorials/tooling/properties tutorials/tooling/symbolic tutorials/tooling/types tutorials/tooling/unit, mcconnell at BerliOS, 03/18/2007

---

Archive powered by MHonArc 2.6.24.