notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1979 - in trunk/central/site/src/docs/util/depot: tasks tutorials

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1979 - in trunk/central/site/src/docs/util/depot: tasks tutorials
Date: Wed, 18 Apr 2007 10:28:31 +0200

Author: mcconnell
Date: 2007-04-18 10:28:30 +0200 (Wed, 18 Apr 2007)
New Revision: 1979

Modified:
trunk/central/site/src/docs/util/depot/tasks/index.xml
trunk/central/site/src/docs/util/depot/tutorials/complex.xml
trunk/central/site/src/docs/util/depot/tutorials/export.xml
trunk/central/site/src/docs/util/depot/tutorials/imports.xml
trunk/central/site/src/docs/util/depot/tutorials/modules.xml
trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
trunk/central/site/src/docs/util/depot/tutorials/unit.xml
Log:
fix multiple documentation references to ant module arising from changes to
the namespace assert by the Ant project

Modified: trunk/central/site/src/docs/util/depot/tasks/index.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tasks/index.xml 2007-04-18
08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tasks/index.xml 2007-04-18
08:28:30 UTC (rev 1979)
@@ -35,10 +35,9 @@

<pre><![CDATA[
<project name="demo" default="install" basedir="."
- xmlns:transit="antlib:dpml.tools.transit"
- xmlns:x="dpml:depot" >
+ xmlns:x="antlib:dpml.tools">

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

</project>
@@ -46,7 +45,7 @@

</subsection>

- <subsection name="Antlib
Namespace"><source>dpml:depot</source></subsection>
+ <subsection name="Antlib
Namespace"><source>dpml:tools</source></subsection>

</section>

Modified: trunk/central/site/src/docs/util/depot/tutorials/complex.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/complex.xml
2007-04-18 08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tutorials/complex.xml
2007-04-18 08:28:30 UTC (rev 1979)
@@ -69,7 +69,7 @@
<index xmlns="dpml:library">

<imports>
- <import uri="link:module:ant"/>
+ <import uri="link:module:org/apache/ant"/>
<import uri="link:module:dpml"/>
</imports>

@@ -88,7 +88,7 @@
<include key="clock-api"/>
</runtime>
<test>
- <include ref="ant/ant-junit"/>
+ <include ref="org/apache/ant/ant-junit"/>
<include ref="dpml/transit/dpml-transit-main"/>
</test>
</dependencies>
@@ -132,12 +132,12 @@
runtime providers: (1)
project:clock-api#SNAPSHOT
test providers: (7)
- resource:ant/ant-launcher#1.6.5
- resource:ant/ant-trax#1.6.5
- resource:ant/ant-xslp#1.6.5
- resource:ant/ant#1.6.5
+ resource:org/apache/ant/ant-launcher#1.7.0
+ resource:org/apache/ant/ant-trax#1.7.0
+ resource:org/apache/ant/ant-xslp#1.7.0
+ resource:org/apache/ant/ant#1.7.0
resource:junit/junit#3.8.1
- resource:ant/ant-junit#1.6.5
+ resource:org/apache/ant/ant-junit#1.7.0
resource:dpml/transit/dpml-transit-main#SNAPSHOT</pre>

</subsection>

Modified: trunk/central/site/src/docs/util/depot/tutorials/export.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/export.xml 2007-04-18
08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tutorials/export.xml 2007-04-18
08:28:30 UTC (rev 1979)
@@ -32,7 +32,7 @@
<index xmlns="dpml:library">

<imports>
- <import uri="link:module:ant"/>
+ <import uri="link:module:org/apache/ant"/>
<import uri="link:module:dpml"/>
</imports>

@@ -57,7 +57,7 @@
<include key="clock-api"/>
</runtime>
<test>
- <include ref="ant/ant-junit"/>
+ <include ref="org/apache/ant/ant-junit"/>
<include ref="dpml/transit/dpml-transit-main"/>
</test>
</dependencies>

Modified: trunk/central/site/src/docs/util/depot/tutorials/imports.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/imports.xml
2007-04-18 08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tutorials/imports.xml
2007-04-18 08:28:30 UTC (rev 1979)
@@ -25,7 +25,7 @@
a module defintion for the Ant system which contains information
about
Ant resources and their respective dependencies. The second change
is the replacement of the manual uri-based dependency includes with
- a single resource reference to <tt>ant/ant-junit</tt>. When Depot
+ a single resource reference to <tt>org/apache/ant/ant-junit</tt>.
When Depot
resolves the transitive dependencies it will take into account the
dependencies declared by the <tt>ant/ant-junit</tt> resource
resulting
in a reliable and complete dependency set. We have also include the
@@ -53,7 +53,7 @@
</types>
<dependencies>
<test>
- <include ref="ant/ant-junit"/>
+ <include ref="org/apache/ant/ant-junit"/>
<include ref="dpml/transit/dpml-transit-main"/>
</test>
</dependencies>
@@ -91,12 +91,12 @@
types: (1)
jar
test providers: (6)
- resource:ant/ant-launcher#1.6.5
- resource:ant/ant-trax#1.6.5
- resource:ant/ant-xslp#1.6.5
- resource:ant/ant#1.6.5
+ resource:org/apache/ant/ant-launcher#1.6.5
+ resource:org/apache/ant/ant-trax#1.6.5
+ resource:org/apache/ant/ant-xslp#1.6.5
+ resource:org/apache/ant/ant#1.6.5
resource:junit/junit#3.8.1
- resource:ant/ant-junit#1.6.5
+ resource:org/apache/ant/ant-junit#1.6.5
resource:dpml/transit/dpml-transit-main#SNAPSHOT</pre>

</subsection>

Modified: trunk/central/site/src/docs/util/depot/tutorials/modules.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/modules.xml
2007-04-18 08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tutorials/modules.xml
2007-04-18 08:28:30 UTC (rev 1979)
@@ -39,7 +39,7 @@
<index xmlns="dpml:library">

<imports>
- <import uri="link:module:ant"/>
+ <import uri="link:module:org/apache/ant"/>
<import uri="link:module:dpml"/>
</imports>

@@ -60,7 +60,7 @@
<include key="clock-api"/>
</runtime>
<test>
- <include ref="ant/ant-junit"/>
+ <include ref="org/apache/ant/ant-junit"/>
<include ref="dpml/transit/dpml-transit-main"/>
</test>
</dependencies>

Modified: trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
2007-04-18 08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tutorials/plugins.xml
2007-04-18 08:28:30 UTC (rev 1979)
@@ -43,7 +43,7 @@
<index xmlns="dpml:library">

<imports>
- <import uri="link:module:ant"/>
+ <import uri="link:module:org/apache/ant"/>
<import uri="link:module:dpml"/>
</imports>

@@ -69,7 +69,7 @@
<include key="clock-api"/>
</runtime>
<test>
- <include ref="ant/ant-junit"/>
+ <include ref="org/apache/ant/ant-junit"/>
<include ref="dpml/transit/dpml-transit-main"/>
</test>
</dependencies>

Modified: trunk/central/site/src/docs/util/depot/tutorials/unit.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tutorials/unit.xml 2007-04-18
08:05:39 UTC (rev 1978)
+++ trunk/central/site/src/docs/util/depot/tutorials/unit.xml 2007-04-18
08:28:30 UTC (rev 1979)
@@ -42,9 +42,9 @@

<dependencies>
<test>
- <include uri="artifact:jar:ant/ant-junit#1.6.5"/>
- <include uri="artifact:jar:ant/ant#1.6.5"/>
- <include uri="artifact:jar:junit/junit#3.8.1"/>
+ <include uri="artifact:jar:org/apache/ant/ant-junit#1.7.0"/>
+ <include uri="artifact:jar:org/apache/ant/ant#1.7.0"/>
+ <include uri="artifact:jar:junit/junit#4.2"/>
</test>
</dependencies>

r1979 - in trunk/central/site/src/docs/util/depot: tasks tutorials, mcconnell at BerliOS, 04/18/2007