Chronological Thread  

< Chronological >       < Thread >

---

Author: mcconnell
Date: 2006-07-22 17:32:54 +0200 (Sat, 22 Jul 2006)
New Revision: 1633

Added:
trunk/tutorials/tooling/complex/build/impl/test.properties
trunk/tutorials/tooling/complex/export/api/
trunk/tutorials/tooling/complex/export/api/build.xml
trunk/tutorials/tooling/complex/export/api/src/
trunk/tutorials/tooling/complex/export/api/src/main/
trunk/tutorials/tooling/complex/export/api/src/main/org/
trunk/tutorials/tooling/complex/export/api/src/main/org/acme/
trunk/tutorials/tooling/complex/export/api/src/main/org/acme/Clock.java
trunk/tutorials/tooling/complex/export/impl/
trunk/tutorials/tooling/complex/export/impl/build.xml
trunk/tutorials/tooling/complex/export/impl/src/
trunk/tutorials/tooling/complex/export/impl/src/main/
trunk/tutorials/tooling/complex/export/impl/src/main/org/
trunk/tutorials/tooling/complex/export/impl/src/main/org/acme/
trunk/tutorials/tooling/complex/export/impl/src/main/org/acme/impl/

trunk/tutorials/tooling/complex/export/impl/src/main/org/acme/impl/SimpleClock.java
trunk/tutorials/tooling/complex/export/impl/src/test/
trunk/tutorials/tooling/complex/export/impl/src/test/org/
trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/
trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/impl/
trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/impl/test/

trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/impl/test/DemoTestCase.java
trunk/tutorials/tooling/complex/export/impl/test.properties
trunk/tutorials/tooling/complex/modules/api/
trunk/tutorials/tooling/complex/modules/api/build.xml
trunk/tutorials/tooling/complex/modules/api/src/
trunk/tutorials/tooling/complex/modules/api/src/main/
trunk/tutorials/tooling/complex/modules/api/src/main/org/
trunk/tutorials/tooling/complex/modules/api/src/main/org/acme/
trunk/tutorials/tooling/complex/modules/api/src/main/org/acme/Clock.java
trunk/tutorials/tooling/complex/modules/impl/
trunk/tutorials/tooling/complex/modules/impl/build.xml
trunk/tutorials/tooling/complex/modules/impl/src/
trunk/tutorials/tooling/complex/modules/impl/src/main/
trunk/tutorials/tooling/complex/modules/impl/src/main/org/
trunk/tutorials/tooling/complex/modules/impl/src/main/org/acme/
trunk/tutorials/tooling/complex/modules/impl/src/main/org/acme/impl/

trunk/tutorials/tooling/complex/modules/impl/src/main/org/acme/impl/SimpleClock.java
trunk/tutorials/tooling/complex/modules/impl/src/test/
trunk/tutorials/tooling/complex/modules/impl/src/test/org/
trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/
trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/impl/
trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/impl/test/

trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/impl/test/DemoTestCase.java
trunk/tutorials/tooling/complex/modules/impl/test.properties
Removed:
trunk/main/metro/model/test.properties
trunk/main/metro/runtime/test.properties
trunk/main/metro/state/test.properties
trunk/main/metro/test/test.properties
Modified:
trunk/central/site/src/docs/about/news/index.xml
trunk/central/site/src/docs/depot/tutorials/export.xml
trunk/central/site/src/docs/depot/tutorials/versioned.xml
trunk/central/site/src/docs/transit/concepts/index.xml
trunk/central/site/src/docs/transit/technical/artifact.xml
trunk/index.xml
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
trunk/main/depot/module.xml

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
trunk/tutorials/components/module.xml
trunk/tutorials/tooling/complex/export/index.xml
trunk/tutorials/tooling/complex/modules/index.xml
Log:
completion of Depot tutorials

Modified: trunk/central/site/src/docs/about/news/index.xml
===================================================================
--- trunk/central/site/src/docs/about/news/index.xml 2006-07-22 14:17:19
UTC (rev 1632)
+++ trunk/central/site/src/docs/about/news/index.xml 2006-07-22 15:32:54
UTC (rev 1633)
@@ -113,7 +113,10 @@

<p>
The first binary distribution of the DPML Platform Freight Train
version
- was release as a snapshot build on the 24 of December. A follow-up
distribution was released earlier today closing some minor issues with the
20051224 build. In parallel <a href="http://www.osm.net";>OSM</a> tutorials
on the Transit and Depot system were brought in-line with the latest 20051228
build.
+ was release as a snapshot build on the 24 of December. A follow-up
+ distribution was released earlier today closing some minor issues
with
+ the 20051224 build. In parallel tutorials on the Transit and Depot
system
+ were brought in-line with the latest 20051228 build.
</p>

<p>
@@ -233,8 +236,7 @@
<p>
A milestone release 20050726 has been prepared with final version of
Transit and Magic and development versions of Depot and Metro. A
- <a href="http://www.osm.net/download/index.html";>binary
- distribution</a> of of Depot is available (which includes Transit)
+ binary distribution of of Depot is available (which includes Transit)
and built-in support for Magic and Metro installs.
</p>
</subsection>
@@ -243,7 +245,7 @@
<p>
<a href="http://www.ibiblio.org";>Ibiblio</a> extends it ongoing
support
for the DPML infrastructure with the addition of virtual hosting for
the
- <a href="http://www.osm.net";>OSM</a> training content and related
resources.
+ training content and related resources.
</p>
</subsection>


Modified: trunk/central/site/src/docs/depot/tutorials/export.xml
===================================================================
--- trunk/central/site/src/docs/depot/tutorials/export.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/central/site/src/docs/depot/tutorials/export.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -81,12 +81,75 @@
<tt>target/deliverables/modules/acme-SNAPSHOT.module</tt> file.
</p>

-<source><![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1"?>
-]]></source>
+<source><font color="blue"><![CDATA[<?xml version="1.0"
encoding="ISO-8859-1"?>
+<module name="org/acme" version="SNAPSHOT"
+ xmlns="link:xsd:dpml/lang/dpml-module#1.0">

+ <types>
+ <type id="module" version="1.0"/>
+ </types>
+
+ <resource name="clock-api" version="SNAPSHOT">
+ <types>
+ <type id="jar"/>
+ </types>
+ </resource>
+
+ <resource name="clock-impl" version="SNAPSHOT">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include ref="org/acme/clock-api"/>
+ </runtime>
+ </dependencies>
+ </resource>
+
+</module>]]></font></source>
+
</subsection>

+ <subsection name="Summary">
+
+ <p>
+ This tutorial has demonstrated the creation of a module artifact.
During module
+ generation our project defintions have been converted to simple
resource defintions
+ (involving the elimination of non-runtime concerns such as basedir,
build and test
+ dependencies, etc.). The remaining information is suitable for full
transitive dependency
+ evaluation by third parties (and associated model/name mapping to
artifact uris). In the
+ same way that we included the Ant module via an include staement -
third-parties can
+ now include the above information using something like:
+ </p>
+
+<pre>
+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;index xmlns="link:xsd:dpml/lang/dpml-module#1.0"&gt;
+
+ &lt;imports&gt;
+ <font color="blue">&lt;import uri="link:module:org/acme#1.0"/&gt;</font>
+ &lt;/imports&gt;
+
+ <font color="gray">...</font>
+
+&lt;/index&gt;
+</pre>
+
+ </subsection>
+
+ <subsection name="However ...">
+
+ <p>
+ The above module definition is not really ready for publication -
after all
+ it contains several references to <tt>SNAPSHOT</tt> versions (and we
don't
+ want to publish anything referrencing a generalized
<tt>SNAPSHOT</tt> version).
+ The <a href="versioned.html">next tutorial</a> takes us through the
process
+ of generating a version build with artifacts suitable for
publication into
+ a shared repository.
+ </p>
+
+ </subsection>
+
</section>

</body>

Modified: trunk/central/site/src/docs/depot/tutorials/versioned.xml
===================================================================
--- trunk/central/site/src/docs/depot/tutorials/versioned.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/central/site/src/docs/depot/tutorials/versioned.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -30,131 +30,151 @@
commandline option.
</p>

-<pre>
-$ build -version 1.0.0 clean install
-</pre>
+<pre>$ build -version 1.0.0
+[1940 ] [INFO ] (depot.build): Initiating build sequence: (3)

-<source><![CDATA[
-C:\dev\osm\trunk\tutorial\tooling\104>build clean install -version 1.0.0
-[1276 ] [INFO ] (depot.build): Initiating build sequence: (3)
+ (1) org/acme/clock-api
+ (2) org/acme/clock-impl
+ (3) org/acme

- (1) acme/acme-client
- (2) acme/acme-system
- (3) acme

-
-------------------------------------------------------------------------
-acme/acme-client#1.0.0
+org/acme/clock-api#1.0.0
-------------------------------------------------------------------------

init:

-clean:
- [delete] Deleting directory
C:\dev\osm\trunk\tutorial\tooling\104\client\target
-
-init:
-
prepare:
-[x:prepare] Created dir: C:\dev\osm\trunk\tutorial\tooling\104\client\target
-[x:prepare] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\client\target\build\main
-[x:prepare] Copying 1 file to
C:\dev\osm\trunk\tutorial\tooling\104\client\target\build\main
+[x:prepare] Created dir: D:\dpml\tutorials\tooling\complex\export\api\target
+[x:prepare] Created dir:
D:\dpml\tutorials\tooling\complex\export\api\target\build\main
+[x:prepare] Copying 1 file to
D:\dpml\tutorials\tooling\complex\export\api\target\build\main

build:
- [javac] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\client\target\classes\main
- [javac] Compiling 1 source file to
C:\dev\osm\trunk\tutorial\tooling\104\client\target\classes\main
+ [javac] Created dir:
D:\dpml\tutorials\tooling\complex\export\api\target\classes\main
+ [javac] Compiling 1 source file to
D:\dpml\tutorials\tooling\complex\export\api\target\classes\main

package:
- [jar] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\client\target\deliverables\jars
- [jar] Building jar:
C:\dev\osm\trunk\tutorial\tooling\104\client\target\deliverables\jars\acme-client-1.0.0.jar
+ [jar] Created dir:
D:\dpml\tutorials\tooling\complex\export\api\target\deliverables\jars
+ [jar] Building jar:
D:\dpml\tutorials\tooling\complex\export\api\target\deliverables\jars\clock-api-1.0.0.jar
[jar] Creating md5 checksum

test:

install:
-[x:install] Copying 2 files to C:\dpml\data\cache\acme
+[x:install] Copying 2 files to D:\system\dpml\data\cache\org\acme

BUILD SUCCESSFUL
Total time: 3 seconds

-------------------------------------------------------------------------
-acme/acme-system#1.0.0
+org/acme/clock-impl#1.0.0
-------------------------------------------------------------------------

init:

-clean:
- [delete] Deleting directory
C:\dev\osm\trunk\tutorial\tooling\104\system\target
-
-init:
-
prepare:
-[x:prepare] Created dir: C:\dev\osm\trunk\tutorial\tooling\104\system\target
-[x:prepare] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\build\main
-[x:prepare] Copying 1 file to
C:\dev\osm\trunk\tutorial\tooling\104\system\target\build\main
-[x:prepare] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\build\test
-[x:prepare] Copying 1 file to
C:\dev\osm\trunk\tutorial\tooling\104\system\target\build\test
-[x:prepare] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\test
+[x:prepare] Created dir: D:\dpml\tutorials\tooling\complex\export\impl\target
+[x:prepare] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\build\main
+[x:prepare] Copying 1 file to
D:\dpml\tutorials\tooling\complex\export\impl\target\build\main
+[x:prepare] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\build\test
+[x:prepare] Copying 1 file to
D:\dpml\tutorials\tooling\complex\export\impl\target\build\test
+[x:prepare] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\test

-standard.build:
- [javac] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\classes\main
- [javac] Compiling 1 source file to
C:\dev\osm\trunk\tutorial\tooling\104\system\target\classes\main
- [javac] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\classes\test
- [javac] Compiling 1 source file to
C:\dev\osm\trunk\tutorial\tooling\104\system\target\classes\test
-
build:
- [rmic] RMI Compiling 1 class to
C:\dev\osm\trunk\tutorial\tooling\104\system\target\classes\main
+ [javac] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\classes\main
+ [javac] Compiling 1 source file to
D:\dpml\tutorials\tooling\complex\export\impl\target\classes\main
+ [javac] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\classes\test
+ [javac] Compiling 1 source file to
D:\dpml\tutorials\tooling\complex\export\impl\target\classes\test

package:
- [jar] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\deliverables\jars
- [jar] Building jar:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\deliverables\jars\acme-system-1.0.0.jar
+ [jar] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\deliverables\jars
+ [jar] Building jar:
D:\dpml\tutorials\tooling\complex\export\impl\target\deliverables\jars\clock-impl-1.0.0.jar
[jar] Creating md5 checksum

test:
- [junit] Created dir:
C:\dev\osm\trunk\tutorial\tooling\104\system\target\reports\test
- [junit] executing in local jvm
- [junit] Running acme.impl.test.DefaultWidgetTestCase
-I'm a plain old red widget named acme-system.
-I'm a blue widget named acme-system
- [junit] Tests run: 3, Failures: 0, Errors: 0, Time elapsed: 0.031 sec
+ [junit] Created dir:
D:\dpml\tutorials\tooling\complex\export\impl\target\reports\test
+ [junit] Executing forked test.
+ [junit] Running org.acme.impl.test.DemoTestCase
+ [junit] [37920] [INFO ] (test): 0:27 AM, CST
+ [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.203 sec

install:
-[x:install] Copying 2 files to C:\dpml\data\cache\acme
+[x:install] Copying 2 files to D:\system\dpml\data\cache\org\acme

BUILD SUCCESSFUL
-Total time: 3 seconds
+Total time: 2 seconds

-------------------------------------------------------------------------
-acme#1.0.0
+org/acme#1.0.0
-------------------------------------------------------------------------

init:

-clean:
- [delete] Deleting directory C:\dev\osm\trunk\tutorial\tooling\104\target
-
-init:
-
prepare:
-[x:prepare] Created dir: C:\dev\osm\trunk\tutorial\tooling\104\target
+[x:prepare] Created dir: D:\dpml\tutorials\tooling\complex\export\target

build:

package:
- [module] Exporting module to:
C:\dev\osm\trunk\tutorial\tooling\104\target\deliverables\modules\acme-1.0.0.module
+ [module] Exporting module to:
D:\dpml\tutorials\tooling\complex\export\target\deliverables\modules\acme-1.0.0.module

test:

install:
-[x:install] acme.module.link
-[x:install] artifact:module:acme#1.0.0
-[x:install] Copying 2 files to C:\dpml\data\cache
+[x:install] acme-1.0.module.link
+[x:install] artifact:module:org/acme#1.0.0
+[x:install] Copying 2 files to D:\system\dpml\data\cache\org

BUILD SUCCESSFUL
Total time: 1 second
-]]></source>

+$</pre>
+
</subsection>
+
+ <subsection name="The Generated Module">
+
+<source><font color="blue"><![CDATA[<?xml version="1.0"
encoding="ISO-8859-1"?>
+<module name="org/acme" version="1.0.0"
+ xmlns="link:xsd:dpml/lang/dpml-module#1.0">
+
+ <types>
+ <type id="module" version="1.0"/>
+ </types>
+
+ <resource name="clock-api" version="1.0.0">
+ <types>
+ <type id="jar"/>
+ </types>
+ </resource>
+
+ <resource name="clock-impl" version="1.0.0">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include ref="org/acme/clock-api"/>
+ </runtime>
+ </dependencies>
+ </resource>
+
+</module>]]></font></source>
+
+ </subsection>

+ <subsection name="Summary">
+
+ <p>
+ The above sequence demonstrates the impact of the <tt>-version</tt>
option
+ in terms of resource naming and the corresponding meta-data (such as
module
+ information) that is generated by the build process. All of the
resources
+ (jars, module files, etc.) are now suitable for publication into a
public
+ (or shared) repository.
+ </p>
+
+ </subsection>
+
</section>

</body>

Modified: trunk/central/site/src/docs/transit/concepts/index.xml
===================================================================
--- trunk/central/site/src/docs/transit/concepts/index.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/central/site/src/docs/transit/concepts/index.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -70,23 +70,6 @@
and more advanced services.
</p>

- <!--
- <subsection name="Tutorials">
-
- <table>
- <tr>
- <td><img src="/images/info.gif"/></td>
- <td><i>The <a href="http://www.osm.net/training/resources/";>
- OSM Resource Management Tutorial</a> covers artifact
- creation, plugin management, content handlers and
- repository creation.</i>
- </td>
- </tr>
- </table>
-
- </subsection>
- -->
-
</section>

</body>

Modified: trunk/central/site/src/docs/transit/technical/artifact.xml
===================================================================
--- trunk/central/site/src/docs/transit/technical/artifact.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/central/site/src/docs/transit/technical/artifact.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -21,6 +21,7 @@

<document>
<properties>
+ <author email="mcconnell AT osm.net">Stephen McConnell</author>
<author email="niclas AT hedhman.org">Niclas Hedhman</author>
<title>DPML Transit Artifact Protocol</title>
</properties>
@@ -39,19 +40,6 @@
two system properties.
</p>

- <subsection name="Tutorial">
-
- <table>
- <tr>
- <td><img src="/images/info.gif"/></td>
- <td><i>See <a
href="http://www.osm.net/training/resources/artifacts.html";>
- OSM Tutorial on Transit Artifacts</a>.</i>
- </td>
- </tr>
- </table>
-
- </subsection>
-
<subsection name="Specification">
<p>
The official specification of the artifact protocol is as follows;

Modified: trunk/index.xml
===================================================================
--- trunk/index.xml 2006-07-22 14:17:19 UTC (rev 1632)
+++ trunk/index.xml 2006-07-22 15:32:54 UTC (rev 1633)
@@ -19,6 +19,9 @@
</properties>

<module name="dpml" basedir="main">
+ <properties>
+ <property name="java.util.logging.config.class" value="dpml"/>
+ </properties>
<types>
<type id="module" alias="true"/>
</types>

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -359,8 +359,10 @@
// exporting the nested module
//

- ModuleDirective directive = (ModuleDirective) exportResource(
this );
- return parent.createWrappedDirective( directive );
+ String path = getResourcePath();
+ return exportModule( this, path );
+ //ModuleDirective directive = (ModuleDirective) exportResource(
this );
+ //return parent.createWrappedDirective( directive );
}
}

@@ -371,6 +373,7 @@
* @param directive the directive to wrap
* @return a top-level module directive containing the wrapped resource
*/
+ /*
private ModuleDirective createWrappedDirective( final ResourceDirective
directive )
{
String name = getName();
@@ -385,6 +388,7 @@
return parent.createWrappedDirective( module );
}
}
+ */

/**
* Return a directive suitable for publication as an external description.
@@ -394,6 +398,18 @@
*/
ResourceDirective exportResource( final DefaultModule module ) throws
IllegalArgumentException
{
+ String name = getName();
+ return exportModule( module, name );
+ }
+
+ /**
+ * Return a directive suitable for publication as an external description.
+ * @param module the enclosing module
+ * @return the resource directive
+ * @exception IllegalArgumentException if the module is not a top-level
module
+ */
+ ModuleDirective exportModule( final DefaultModule module, final String
name ) throws IllegalArgumentException
+ {
DefaultResource[] resources = getDefaultResources();
ResourceDirective[] directives = new ResourceDirective[
resources.length ];
for( int i=0; i<directives.length; i++ )
@@ -401,7 +417,6 @@
DefaultResource resource = resources[i];
directives[i] = resource.exportResource( module );
}
- String name = getName();
String version = getVersion();
String basedir = null;
InfoDirective info = m_directive.getInfoDirective();

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -47,7 +47,7 @@
* to a generic type declaration. The resulting XML file is suitable for
* publication and usage by external projects.
*
- * @param module the moudle directive to externalize
+ * @param module the module directive to externalize
* @param output the output stream
* @exception IOException if an error occurs during module externalization
*/
@@ -74,12 +74,8 @@
writer.write(
"\n xmlns=\""
+ MODULE_XSD_URI
- + "\""
- + "\n xmlns:xsi=\""
- + XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI
+ "\">" );

-
String basedir = module.getBasedir();
InfoDirective info = module.getInfoDirective();
Properties properties = module.getProperties();

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-07-22 14:17:19 UTC (rev 1632)
+++ trunk/main/depot/module.xml 2006-07-22 15:32:54 UTC (rev 1633)
@@ -3,7 +3,7 @@
xmlns="link:xsd:dpml/lang/dpml-module#1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="link:xsd:dpml/lang/dpml-part#1.0">
-
+
<resource name="dpml-library" basedir="library">
<types>
<type id="jar"/>

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -397,6 +397,22 @@
junit.addConfiguredSysproperty( log );
}

+ String formatter = getResource().getProperty(
"java.util.logging.config.class" );
+ if( null != formatter )
+ {
+ final Environment.Variable logging = new Environment.Variable();
+ logging.setKey( "java.util.logging.config.class" );
+ if( "dpml".equals( formatter ) )
+ {
+ logging.setValue( "net.dpml.util.ConfigurationHandler" );
+ }
+ else
+ {
+ logging.setValue( formatter );
+ }
+ junit.addConfiguredSysproperty( logging );
+ }
+
final Environment.Variable endorsed = new Environment.Variable();
endorsed.setKey( "java.endorsed.dirs" );
endorsed.setValue( new File( Transit.DPML_SYSTEM, "lib/endorsed"
).getAbsolutePath() );

Deleted: trunk/main/metro/model/test.properties
===================================================================
--- trunk/main/metro/model/test.properties 2006-07-22 14:17:19 UTC (rev
1632)
+++ trunk/main/metro/model/test.properties 2006-07-22 15:32:54 UTC (rev
1633)
@@ -1 +0,0 @@
-java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Deleted: trunk/main/metro/runtime/test.properties
===================================================================
--- trunk/main/metro/runtime/test.properties 2006-07-22 14:17:19 UTC (rev
1632)
+++ trunk/main/metro/runtime/test.properties 2006-07-22 15:32:54 UTC (rev
1633)
@@ -1 +0,0 @@
-java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Deleted: trunk/main/metro/state/test.properties
===================================================================
--- trunk/main/metro/state/test.properties 2006-07-22 14:17:19 UTC (rev
1632)
+++ trunk/main/metro/state/test.properties 2006-07-22 15:32:54 UTC (rev
1633)
@@ -1 +0,0 @@
-java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Deleted: trunk/main/metro/test/test.properties
===================================================================
--- trunk/main/metro/test/test.properties 2006-07-22 14:17:19 UTC (rev
1632)
+++ trunk/main/metro/test/test.properties 2006-07-22 15:32:54 UTC (rev
1633)
@@ -1 +0,0 @@
-java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Modified: trunk/tutorials/components/module.xml
===================================================================
--- trunk/tutorials/components/module.xml 2006-07-22 14:17:19 UTC (rev
1632)
+++ trunk/tutorials/components/module.xml 2006-07-22 15:32:54 UTC (rev
1633)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module xmlns="link:xsd:dpml/lang/dpml-module#1.0" name="components">

+ <properties>
+ <property name="java.util.logging.config.class" value="dpml"/>
+ </properties>
+
<dependencies>
<build>
<include ref="dpml"/>

Added: trunk/tutorials/tooling/complex/build/impl/test.properties
===================================================================
--- trunk/tutorials/tooling/complex/build/impl/test.properties 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/build/impl/test.properties 2006-07-22
15:32:54 UTC (rev 1633)
@@ -0,0 +1 @@
+java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Added: trunk/tutorials/tooling/complex/export/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/api/build.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/export/api/build.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="demo" default="install"
+ xmlns:transit="antlib:net.dpml.transit">
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+</project>

Added: trunk/tutorials/tooling/complex/export/api/src/main/org/acme/Clock.java
===================================================================
--- trunk/tutorials/tooling/complex/export/api/src/main/org/acme/Clock.java
2006-07-22 14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/export/api/src/main/org/acme/Clock.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+import java.util.Date;
+
+/**
+ * Clock interface.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Clock
+{
+ String getTimestamp();
+}

Added: trunk/tutorials/tooling/complex/export/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/impl/build.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/export/impl/build.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="demo" default="install"
+ xmlns:transit="antlib:net.dpml.transit">
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+</project>

Added:
trunk/tutorials/tooling/complex/export/impl/src/main/org/acme/impl/SimpleClock.java
===================================================================
---
trunk/tutorials/tooling/complex/export/impl/src/main/org/acme/impl/SimpleClock.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/tutorials/tooling/complex/export/impl/src/main/org/acme/impl/SimpleClock.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1,66 @@
+/*
+ * 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.impl;
+
+import java.util.Date;
+import java.util.Locale;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import org.acme.Clock;
+
+/**
+ * A minimal implementation of a clock.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class SimpleClock implements Clock
+{
+ //------------------------------------------------------------------
+ // static
+ //------------------------------------------------------------------
+
+ private static final String DEFAULT_PATTERN = "K:mm a, z";
+ private static final Locale DEFAULT_LOCALE = Locale.getDefault();
+
+ //------------------------------------------------------------------
+ // Clock
+ //------------------------------------------------------------------
+
+ /**
+ * Return the current time as a formatted string.
+ * @return the current time as a string
+ */
+ public String getTimestamp()
+ {
+ Date date = new Date();
+ DateFormat formatter = getDateFormatter();
+ return formatter.format( date );
+ }
+
+ //------------------------------------------------------------------
+ // implementation
+ //------------------------------------------------------------------
+
+ private DateFormat getDateFormatter()
+ {
+ return new SimpleDateFormat( DEFAULT_PATTERN, DEFAULT_LOCALE );
+ }
+}

Added:
trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/impl/test/DemoTestCase.java
===================================================================
---
trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/impl/test/DemoTestCase.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/tutorials/tooling/complex/export/impl/src/test/org/acme/impl/test/DemoTestCase.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1,48 @@
+/*
+ * 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.impl.test;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+import junit.framework.TestCase;
+
+import org.acme.Clock;
+import org.acme.impl.SimpleClock;
+
+/**
+ * Deployment of the demo component.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class DemoTestCase extends TestCase
+{
+ /**
+ * Just log the timestamp to the test output.
+ * @exception Exception if an error occurs
+ */
+ public void testTheClock() throws Exception
+ {
+ SimpleClock clock = new SimpleClock();
+ String timestamp = clock.getTimestamp();
+ Logger logger = Logger.getLogger( "test" );
+ logger.info( timestamp );
+ }
+}

Added: trunk/tutorials/tooling/complex/export/impl/test.properties
===================================================================
--- trunk/tutorials/tooling/complex/export/impl/test.properties 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/export/impl/test.properties 2006-07-22
15:32:54 UTC (rev 1633)
@@ -0,0 +1 @@
+java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Modified: trunk/tutorials/tooling/complex/export/index.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/index.xml 2006-07-22 14:17:19
UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/export/index.xml 2006-07-22 15:32:54
UTC (rev 1633)
@@ -1,22 +1,38 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="link:xsd:dpml/lang/dpml-module#1.0">

+ <imports>
+ <import uri="link:module:ant"/>
+ <import uri="link:module:dpml"/>
+ </imports>
+
<module name="org/acme" basedir=".">

<types>
<type id="module" version="1.0"/>
</types>

- <project name="widget" basedir="widget"/>
+ <project name="clock-api" basedir="api">
+ <types>
+ <type id="jar"/>
+ </types>
+ </project>

- <project name="gizmo" basedir="gizmo">
+ <project name="clock-impl" basedir="impl">
+ <types>
+ <type id="jar"/>
+ </types>
<dependencies>
- <build>
- <include key="widget"/>
- </build>
+ <runtime>
+ <include key="clock-api"/>
+ </runtime>
+ <test>
+ <include ref="ant/ant-junit"/>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </test>
</dependencies>
</project>
-
+
</module>

</index>

Added: trunk/tutorials/tooling/complex/modules/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/api/build.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/modules/api/build.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="demo" default="install"
+ xmlns:transit="antlib:net.dpml.transit">
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+</project>

Added:
trunk/tutorials/tooling/complex/modules/api/src/main/org/acme/Clock.java
===================================================================
--- trunk/tutorials/tooling/complex/modules/api/src/main/org/acme/Clock.java
2006-07-22 14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/modules/api/src/main/org/acme/Clock.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+import java.util.Date;
+
+/**
+ * Clock interface.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Clock
+{
+ String getTimestamp();
+}

Added: trunk/tutorials/tooling/complex/modules/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/impl/build.xml 2006-07-22
14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/modules/impl/build.xml 2006-07-22
15:32:54 UTC (rev 1633)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="demo" default="install"
+ xmlns:transit="antlib:net.dpml.transit">
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+</project>

Added:
trunk/tutorials/tooling/complex/modules/impl/src/main/org/acme/impl/SimpleClock.java
===================================================================
---
trunk/tutorials/tooling/complex/modules/impl/src/main/org/acme/impl/SimpleClock.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/tutorials/tooling/complex/modules/impl/src/main/org/acme/impl/SimpleClock.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1,66 @@
+/*
+ * 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.impl;
+
+import java.util.Date;
+import java.util.Locale;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import org.acme.Clock;
+
+/**
+ * A minimal implementation of a clock.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class SimpleClock implements Clock
+{
+ //------------------------------------------------------------------
+ // static
+ //------------------------------------------------------------------
+
+ private static final String DEFAULT_PATTERN = "K:mm a, z";
+ private static final Locale DEFAULT_LOCALE = Locale.getDefault();
+
+ //------------------------------------------------------------------
+ // Clock
+ //------------------------------------------------------------------
+
+ /**
+ * Return the current time as a formatted string.
+ * @return the current time as a string
+ */
+ public String getTimestamp()
+ {
+ Date date = new Date();
+ DateFormat formatter = getDateFormatter();
+ return formatter.format( date );
+ }
+
+ //------------------------------------------------------------------
+ // implementation
+ //------------------------------------------------------------------
+
+ private DateFormat getDateFormatter()
+ {
+ return new SimpleDateFormat( DEFAULT_PATTERN, DEFAULT_LOCALE );
+ }
+}

Added:
trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/impl/test/DemoTestCase.java
===================================================================
---
trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/impl/test/DemoTestCase.java
2006-07-22 14:17:19 UTC (rev 1632)
+++
trunk/tutorials/tooling/complex/modules/impl/src/test/org/acme/impl/test/DemoTestCase.java
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1,48 @@
+/*
+ * 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.impl.test;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+import junit.framework.TestCase;
+
+import org.acme.Clock;
+import org.acme.impl.SimpleClock;
+
+/**
+ * Deployment of the demo component.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class DemoTestCase extends TestCase
+{
+ /**
+ * Just log the timestamp to the test output.
+ * @exception Exception if an error occurs
+ */
+ public void testTheClock() throws Exception
+ {
+ SimpleClock clock = new SimpleClock();
+ String timestamp = clock.getTimestamp();
+ Logger logger = Logger.getLogger( "test" );
+ logger.info( timestamp );
+ }
+}

Added: trunk/tutorials/tooling/complex/modules/impl/test.properties
===================================================================
--- trunk/tutorials/tooling/complex/modules/impl/test.properties
2006-07-22 14:17:19 UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/modules/impl/test.properties
2006-07-22 15:32:54 UTC (rev 1633)
@@ -0,0 +1 @@
+java.util.logging.config.class = net.dpml.util.ConfigurationHandler
\ No newline at end of file

Modified: trunk/tutorials/tooling/complex/modules/index.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/index.xml 2006-07-22 14:17:19
UTC (rev 1632)
+++ trunk/tutorials/tooling/complex/modules/index.xml 2006-07-22 15:32:54
UTC (rev 1633)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<index xmlns="link:xsd:dpml/lang/dpml-module#1.0">

+ <imports>
+ <import uri="link:module:ant"/>
+ <import uri="link:module:dpml"/>
+ </imports>
+
<module name="org/acme" basedir=".">
-
- <project name="widget" basedir="widget"/>

- <project name="gizmo" basedir="gizmo">
+ <project name="clock-api" basedir="api">
+ <types>
+ <type id="jar"/>
+ </types>
+ </project>
+
+ <project name="clock-impl" basedir="impl">
+ <types>
+ <type id="jar"/>
+ </types>
<dependencies>
- <build>
- <include key="widget"/>
- </build>
+ <runtime>
+ <include key="clock-api"/>
+ </runtime>
+ <test>
+ <include ref="ant/ant-junit"/>
+ <include ref="dpml/transit/dpml-transit-main"/>
+ </test>
</dependencies>
</project>
-
+
</module>

</index>

---

• r1633 - in trunk: . central/site/src/docs/about/news central/site/src/docs/depot/tutorials central/site/src/docs/transit/concepts central/site/src/docs/transit/technical main/depot main/depot/library/src/main/net/dpml/library/impl main/depot/library/src/main/net/dpml/library/info main/depot/tools/builder/src/main/net/dpml/tools/tasks main/metro/model main/metro/runtime main/metro/state main/metro/test tutorials/components tutorials/tooling/complex/build/impl tutorials/tooling/complex/export tutorials/tooling/complex/export/api tutorials/tooling/complex/export/api/src tutorials/tooling/complex/export/api/src/main tutorials/tooling/complex/export/api/src/main/org tutorials/tooling/complex/export/api/src/main/org/acme tutorials/tooling/complex/export/impl tutorials/tooling/complex/export/impl/src tutorials/tooling/complex/export/impl/src/main tutorials/tooling/complex/export/impl/src/main/org tutorials/tooling/complex/export/impl/src/main/org/acme tutorials/tooling/com! plex/export/impl/src/main/org/acme/impl tutorials/tooling/complex/export/impl/src/test tutorials/tooling/complex/export/impl/src/test/org tutorials/tooling/complex/export/impl/src/test/org/acme tutorials/tooling/complex/export/impl/src/test/org/acme/impl tutorials/tooling/complex/export/impl/src/test/org/acme/impl/test tutorials/tooling/complex/modules tutorials/tooling/complex/modules/api tutorials/tooling/complex/modules/api/src tutorials/tooling/complex/modules/api/src/main tutorials/tooling/complex/modules/api/src/main/org tutorials/tooling/complex/modules/api/src/main/org/acme tutorials/tooling/complex/modules/impl tutorials/tooling/complex/modules/impl/src tutorials/tooling/complex/modules/impl/src/main tutorials/tooling/complex/modules/impl/src/main/org tutorials/tooling/complex/modules/impl/src/main/org/acme tutorials/tooling/complex/modules/impl/src/main/org/acme/impl tutorials/tooling/complex/modules/impl/src/test tutorials/tooling/complex/modules/impl/src/test/or! g tutorials/tooling/complex/modules/impl/src/test/org/acme tut! orials/t, mcconnell at BerliOS, 07/22/2006

---

Archive powered by MHonArc 2.6.24.