notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1670 - in trunk: central/site central/site/src/docs/about/download main

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1670 - in trunk: central/site central/site/src/docs/about/download main
Date: Tue, 25 Jul 2006 21:37:10 +0200

Author: mcconnell
Date: 2006-07-25 21:37:07 +0200 (Tue, 25 Jul 2006)
New Revision: 1670

Modified:
trunk/central/site/build.xml
trunk/central/site/src/docs/about/download/archive.xml
trunk/main/build.xml
Log:
housekeeping

Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2006-07-25 18:47:13 UTC (rev 1669)
+++ trunk/central/site/build.xml 2006-07-25 19:37:07 UTC (rev 1670)
@@ -9,10 +9,141 @@

<target name="init" depends="standard.init">
<x:property name="dpml.module.version" ref="dpml" feature="version"/>
+ <property name="docs.filename"
value="dpml-sdk-docs-${dpml.module.version}.zip"/>
+ <property name="docs.dir" location="target/dist"/>
+ <property name="docs.path" location="${docs.dir}/${docs.filename}"/>
</target>

- <target name="prepare" depends="standard.prepare">
+ <target name="prepare" depends="standard.prepare"/>

+ <target name="build" depends="standard.build,site"/>
+
+ <target name="package" depends="standard.package,zip" description="Creates
a documentation distribution archive."/>
+
+ <target name="install" depends="standard.install">
+ <mkdir dir="${dpml.data}/dist"/>
+ <mkdir dir="${dpml.data}/docs"/>
+ <copy toDir="${dpml.data}/docs">
+ <fileset dir="${basedir}/target/docs"/>
+ </copy>
+ <copy toDir="${dpml.data}/dist">
+ <fileset dir="${basedir}/target/dist">
+ <include name="${docs.filename}.*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="zip" depends="site" >
+ <mkdir dir="${docs.dir}"/>
+ <zip destfile="${docs.path}" duplicate="fail">
+ <zipfileset dir="target/docs" prefix="share/docs"/>
+ </zip>
+ <checksum file="${docs.path}" fileext=".md5"/>
+ </target>
+
+ <target name="catalog" depends="init">
+ <property name="catalog.path"
location="${basedir}/target/docs/reports/${dpml.module.version}/catalog"/>
+ <mkdir dir="${catalog.path}"/>
+ <x:plugin uri="link:part:dpml/metro/dpml-metro-tools"/>
+ <c:catalog title="DPML Catalog" dest="${catalog.path}">
+ <fileset dir="${basedir}/../../main">
+ <include name="**/target/classes/main/**/*.type"/>
+ <exclude name="**/test/**/*.*"/>
+ </fileset>
+ </c:catalog>
+ </target>
+
+ <target name="site" depends="docs,javadoc,junit-report,catalog">
+ <x:docs dest="${dpml.data}/docs"/>
+ </target>
+
+ <target name="docs" depends="tutorials.prepare">
+ <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}"/>
+ <mkdir dir="${api.path}"/>
+ <x:javadoc title="DPML Component Management Platform" access="protected"
ref="dpml"
+ dest="${api.path}">
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ <link href="http://api.dpml.net/javax/servlet/2.5"/>
+ <link href="http://api.dpml.net/jetty/20060213"/>
+ <group title="Library">
+ <package name="net.dpml.library"/>
+ <package name="net.dpml.library.*"/>
+ </group>
+ <group title="Depot">
+ <package name="net.dpml.depot"/>
+ <package name="net.dpml.depot.*"/>
+ <package name="net.dpml.tools"/>
+ <package name="net.dpml.tools.*"/>
+ </group>
+ <group title="Transit">
+ <package name="net.dpml.lang"/>
+ <package name="net.dpml.transit"/>
+ <package name="net.dpml.transit.*"/>
+ <package name="net.dpml.util"/>
+ </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="net.dpml.cli"/>
+ <package name="net.dpml.cli.*"/>
+ <package name="net.dpml.i18n"/>
+ <package name="net.dpml.i18n.*"/>
+ <package name="net.dpml.logging"/>
+ <package name="net.dpml.logging.*"/>
+ </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}"/>
+ <junitreport todir="${junit.html}">
+ <fileset dir="${basedir}/../../main">
+ <include name="**/target/reports/test/TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${junit.html}"
styledir="${dpml.prefs}/dpml/tools/xsls"/>
+ </junitreport>
+ </target>
+
+ <target name="checkstyle" depends="prepare">
+ <property name="checkstyle.dir"
location="${basedir}/target/reports/checkstyle"/>
+ <property name="checkstyle.data"
location="${checkstyle.dir}/checkstyle.xml"/>
+ <x:plugin uri="link:part:dpml/depot/dpml-depot-checkstyle">
+ <task class="net.dpml.tools.checkstyle.CheckstyleTask"
name="checkstyle"/>
+ </x:plugin>
+ <mkdir dir="${checkstyle.dir}"/>
+ <checkstyle>
+ <formatter type="xml" toFile="${checkstyle.data}"/>
+ <fileset dir="../../main">
+ <include name="**/target/build/main/**/*.java"/>
+ <include name="**/target/build/test/**/*.java"/>
+ </fileset>
+ </checkstyle>
+ <xslt style="${dpml.prefs}/dpml/tools/xsls/checkstyle-frames.xsl"
+ in="${checkstyle.data}"
+ out="${checkstyle.dir}/checkstyle_report.html">
+ <param name="output.dir" expression="${checkstyle.dir}"/>
+ </xslt>
+ </target>
+
+ <target name="tutorials.prepare" depends="standard.prepare">
+


<x:property name="tooling.dir" feature="basedir"
ref="dpmlx/tutorials/tooling"/>
@@ -25,18 +156,6 @@
</fileset>
</copy>

- 
-


<x:property name="components.dir" feature="basedir"
ref="dpmlx/tutorials/components"/>
@@ -169,105 +288,5 @@

</target>

-
- <target name="build" depends="standard.build,docs,javadoc,catalog"/>
-
- <target name="catalog" depends="init">
- <property name="catalog.path"
location="${basedir}/target/docs/reports/${dpml.module.version}/catalog"/>
- <mkdir dir="${catalog.path}"/>
- <x:plugin uri="link:part:dpml/metro/dpml-metro-tools"/>
- <c:catalog title="DPML Catalog" dest="${catalog.path}">
- <fileset dir="${basedir}/../../main">
- <include name="**/target/classes/main/**/*.type"/>
- <exclude name="**/test/**/*.*"/>
- </fileset>
- </c:catalog>
- </target>
-
- <target name="docs" depends="prepare">
- <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}"/>
- <mkdir dir="${api.path}"/>
- <x:javadoc title="DPML Component Management Platform" access="protected"
ref="dpml"
- dest="${api.path}">
- <link href="http://java.sun.com/j2se/1.4/docs/api"/>
- <link href="http://api.dpml.net/javax/servlet/2.5"/>
- <link href="http://api.dpml.net/jetty/20060213"/>
- <group title="Library">
- <package name="net.dpml.library"/>
- <package name="net.dpml.library.*"/>
- </group>
- <group title="Depot">
- <package name="net.dpml.depot"/>
- <package name="net.dpml.depot.*"/>
- <package name="net.dpml.tools"/>
- <package name="net.dpml.tools.*"/>
- </group>
- <group title="Transit">
- <package name="net.dpml.lang"/>
- <package name="net.dpml.transit"/>
- <package name="net.dpml.transit.*"/>
- <package name="net.dpml.util"/>
- </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="net.dpml.cli"/>
- <package name="net.dpml.cli.*"/>
- <package name="net.dpml.i18n"/>
- <package name="net.dpml.i18n.*"/>
- <package name="net.dpml.logging"/>
- <package name="net.dpml.logging.*"/>
- </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}"/>
- <junitreport todir="${junit.html}">
- <fileset dir="${basedir}/../../main">
- <include name="**/target/reports/test/TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${junit.html}"
styledir="${dpml.prefs}/dpml/tools/xsls"/>
- </junitreport>
- </target>
-
- <target name="checkstyle" depends="prepare">
- <property name="checkstyle.dir"
location="${basedir}/target/reports/checkstyle"/>
- <property name="checkstyle.data"
location="${checkstyle.dir}/checkstyle.xml"/>
- <x:plugin uri="link:part:dpml/depot/dpml-depot-checkstyle">
- <task class="net.dpml.tools.checkstyle.CheckstyleTask"
name="checkstyle"/>
- </x:plugin>
- <mkdir dir="${checkstyle.dir}"/>
- <checkstyle>
- <formatter type="xml" toFile="${checkstyle.data}"/>
- <fileset dir="../../main">
- <include name="**/target/build/main/**/*.java"/>
- <include name="**/target/build/test/**/*.java"/>
- </fileset>
- </checkstyle>
- <xslt style="${dpml.prefs}/dpml/tools/xsls/checkstyle-frames.xsl"
- in="${checkstyle.data}"
- out="${checkstyle.dir}/checkstyle_report.html">
- <param name="output.dir" expression="${checkstyle.dir}"/>
- </xslt>
- </target>
-
</project>

Modified: trunk/central/site/src/docs/about/download/archive.xml
===================================================================
--- trunk/central/site/src/docs/about/download/archive.xml 2006-07-25
18:47:13 UTC (rev 1669)
+++ trunk/central/site/src/docs/about/download/archive.xml 2006-07-25
19:37:07 UTC (rev 1670)
@@ -24,9 +24,13 @@
</p>

<ul>
+ <li>Depot and Metro tutorials.</li>
+ <li>Super-component support in component defintion.</li>
+ <li>Moved main library defintion to <tt>index.xml</tt> and
corresponding
+ <tt><index></tt> top-level element.</li>
<li>Updated project/module/resource <tt>info</tt> element to be
equivalent
to the info element declared under the <tt>plugin</tt>
schema.</li>
- <li>Documentation improvements inclouding information about type
versions
+ <li>Documentation improvements including information about type
versions
and alias references.</li>
<li>Addition of testcases dealing with <tt>xsi:type</tt> usage in
plugin
XML instances.</li>
@@ -35,7 +39,7 @@
<li>Removal of redundant declaration in component and type
XSD.</li>
<li>Updated Type class to support dynamic introspection of context
inner interfaces
allowing component creation without an explicit .type
resource).</li>
- <li>Consolidated duplicate code dealing with freature
resolution.</li>
+ <li>Consolidated duplicate code dealing with feature
resolution.</li>
</ul>

<table>
@@ -71,12 +75,23 @@
<a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-linux-@VERSION@.tar.gz.md5";>
MD5</a>
</td>
- </tr>
+ </tr>
+ <tr>
+ <td>Documentation Archive</td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-docs-@VERSION@.zip";>
+ dpml-sdk-docs-@VERSION@.zip</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-docs-@VERSION@.zip.md5";>
+ MD5</a>
+ </td>
+ </tr>
</table>

<p>
Online <a href="http://api.dpml.net/dpml/@VERSION@";>Javadoc</a>,
- <a href="http://www.dpml.net/reports/@VERSION@/junit";>JUnit</a> and
<a
href="http://www.dpml.net/reports/@VERSION@/catalog/index.html";>Catalog</a>
reports are available.
+ <a href="http://www.dpml.net/reports/@VERSION@/junit";>JUnit</a> and
<a href="http://www.dpml.net/reports/@VERSION@/catalog";>Catalog</a> reports
are available.
</p>

</subsection>

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-07-25 18:47:13 UTC (rev 1669)
+++ trunk/main/build.xml 2006-07-25 19:37:07 UTC (rev 1670)
@@ -42,7 +42,7 @@
<mkdir dir="${share.docs}"/>
</target>

- <target name="package" depends="standard.package"/> 
+ <target name="package" depends="standard.package"/>

<target name="install" depends="standard.install,zip,tar,nsis">
<copy todir="${dpml.data}">

r1670 - in trunk: central/site central/site/src/docs/about/download main, mcconnell at BerliOS, 07/25/2006