notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1824 - trunk/main

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1824 - trunk/main
Date: Fri, 9 Feb 2007 00:35:43 +0100

Author: mcconnell
Date: 2007-02-09 00:35:42 +0100 (Fri, 09 Feb 2007)
New Revision: 1824

Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/bootstrap.properties
trunk/main/bootstrap.xml
trunk/main/build.xml
Log:
SDK 2.X staged commit.

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2007-02-08 23:35:00 UTC (rev 1823)
+++ trunk/main/bootstrap 2007-02-08 23:35:42 UTC (rev 1824)
@@ -33,9 +33,9 @@
ant -f bootstrap.xml xml
}

-dpmlModule()
+dpmlLangLibrary()
{
- cd lang/module
+ cd lang/library
build -f bootstrap.xml clean install
cd ../..
}
@@ -47,27 +47,13 @@
cd ../..
}

-dpmlState()
+dpmlPartRebuild()
{
- cd lang/state
- build -f bootstrap.xml clean install
+ cd lang/part
+ build clean install
cd ../..
}

-dpmlComponent()
-{
- cd lang/component
- build -f bootstrap.xml clean install
- cd ../..
-}
-
-dpmlType()
-{
- cd lang/type
- build -f bootstrap.xml clean install
- cd ../..
-}
-
transitMain()
{
cd transit/core
@@ -125,17 +111,14 @@
}

antlibCleanup
-xmlSetup
-dpmlModule
-dpmlPart
-dpmlState
-dpmlType
-dpmlComponent
transitMain
+dpmlLangLibrary
+dpmlPart
transitTools
dpmlLibrary
depotAntBuilder
externalModules
utilCli
depotBuild
+dpmlPartRebuild
depotCore

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2007-02-08 23:35:00 UTC (rev 1823)
+++ trunk/main/bootstrap.bat 2007-02-08 23:35:42 UTC (rev 1824)
@@ -17,36 +17,35 @@
set ARG_ONE=%1
CALL :antlib-cleanup
rem IF ERRORLEVEL 1 GOTO :exit
-CALL :xml-setup
-IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-module
-IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-part
-IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-state
-IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-type
-IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-component
-IF ERRORLEVEL 1 GOTO :exit
CALL :transit-main
IF ERRORLEVEL 1 GOTO :exit
-CALL :transit-tools
+CALL :depot-lang-part
IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-library
+CALL :dpml-depot-library
IF ERRORLEVEL 1 GOTO :exit
-CALL :depot-ant-builder
+CALL :dpml-util-cli
IF ERRORLEVEL 1 GOTO :exit
-CALL :external-modules
+CALL :dpml-depot-build
IF ERRORLEVEL 1 GOTO :exit
-CALL :util-cli
+CALL :dpml-depot-builder
IF ERRORLEVEL 1 GOTO :exit
-CALL :depot-build
-IF ERRORLEVEL 1 GOTO :exit
-CALL :depot-core
-IF ERRORLEVEL 1 GOTO :exit
-ECHO BOOTSTRAP SUCCESSFUL

+rem
+rem Depot build tool is now available.
+rem Proceed with the creation of the external modules using Depot build exe.
+rem
+
+CALL :external-modules
+IF ERRORLEVEL 0 ( ECHO BOOTSTRAP SUCCESSFUL [%ERRORLEVEL%] ) ELSE ( ECHO
BOOTSTRAP FAILED [%ERRORLEVEL%] )
+
+rem
+rem Bootstrap build is not complete and external module definitions are in
the cache.
+rem We can now processed with a regular build.
+rem
+
+GOTO :EOF
+
+
:exit
IF ERRORLEVEL 1 ECHO BOOTSTRAP FAILED
GOTO :EOF
@@ -57,88 +56,71 @@
POPD
GOTO :EOF

-:xml-setup
-CALL ant -f bootstrap.xml xml
-GOTO :EOF
+rem :xml-setup
+rem CALL ant -f bootstrap.xml xml
+rem GOTO :EOF

-:dpml-module
-PUSHD lang\module
+:depot-lang-part
+PUSHD lang\part
CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:dpml-part
+:depot-lang-part-rebuild
PUSHD lang\part
-CALL :build -f bootstrap.xml clean install
+CALL :build clean install
POPD
GOTO :EOF

-:dpml-state
-PUSHD lang\state
-CALL :build -f bootstrap.xml clean install
-POPD
-GOTO :EOF
-
-:dpml-component
-PUSHD lang\component
-CALL :build -f bootstrap.xml clean install
-POPD
-GOTO :EOF
-
-:dpml-type
-PUSHD lang\type
-CALL :build -f bootstrap.xml clean install
-POPD
-GOTO :EOF
-
:transit-main
PUSHD transit\core
CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:transit-tools
+:dpml-transit-tools
PUSHD transit\tools
CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:dpml-library
+:dpml-depot-library
PUSHD depot\library
CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:depot-ant-builder
+:dpml-depot-builder
PUSHD depot\tools
CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:external-modules
-PUSHD external
-CALL :build clean install
-POPD
-GOTO :EOF
-
-:util-cli
+:dpml-util-cli
PUSHD util\cli
-CALL :build clean install
+rem CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:depot-build
+:dpml-depot-build
PUSHD depot\build
CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF

-:depot-core
-PUSHD depot\core
-CALL :build -f bootstrap.xml clean install
+:external-modules
+PUSHD external
+CALL build clean install
POPD
GOTO :EOF

+rem :depot-core
+rem PUSHD depot\core
+rem CALL :build -f bootstrap.xml clean install
+rem POPD
+rem GOTO :EOF
+
:build

@echo on

Modified: trunk/main/bootstrap.properties
===================================================================
--- trunk/main/bootstrap.properties 2007-02-08 23:35:00 UTC (rev 1823)
+++ trunk/main/bootstrap.properties 2007-02-08 23:35:42 UTC (rev 1824)
@@ -2,23 +2,17 @@
dpml.xsd.version = 1.0
dpml.repository = http://repository.dpml.net/classic

-junit.version = 3.8.1
+junit.version = 4.2
junit.filename = junit-${junit.version}.jar
junit.uri = artifact:jar:junit/junit#${junit.version}
-junit.url = ${dpml.repository}/junit/jars/${junit.filename}
+junit.url =
http://repository.dpml.net/modern/junit/junit/${junit.version}/${junit.filename}

-transit-ant.version = 1.6.5
+transit-ant.version = 1.7.0
transit-ant.filename = ant-${transit-ant.version}.jar
transit-ant.parent = ant/jars
transit-ant.path = ${transit-ant.parent}/${transit-ant.filename}
-ant.uri = artifact:jar:ant/ant#${transit-ant.version}

+ant.uri = artifact:jar:ant/ant#${transit-ant.version}
ant.junit.filename = ant-junit-${transit-ant.version}.jar
ant.junit.uri = artifact:jar:ant/ant-junit#${transit-ant.version}

-xml.cache.path = org/apache/xml/jars
-xerces.filename = xerces-2.8.0.jar
-xmlapi.filename = xml-apis-2.8.0.jar
-xerces.url = ${dpml.repository}/${xml.cache.path}/${xerces.filename}
-xmlapi.url = ${dpml.repository}/${xml.cache.path}/${xmlapi.filename}
-

Modified: trunk/main/bootstrap.xml
===================================================================
--- trunk/main/bootstrap.xml 2007-02-08 23:35:00 UTC (rev 1823)
+++ trunk/main/bootstrap.xml 2007-02-08 23:35:42 UTC (rev 1824)
@@ -195,7 +195,7 @@
</echo>
<filter value="${project.version}" token="PROJECT-VERSION"/>
<filter value="http://www.dpml.net"; token="PUBLISHER-URL"/>
- <filter value="The Digital Product Meta Library" token="PUBLISHER-NAME"/>
+ <filter value="The Digital Product Management Laboratory"
token="PUBLISHER-NAME"/>
</target>

<target name="setup-path" depends="init">
@@ -405,10 +405,10 @@
<mkdir dir="${target.deliverables.jars.dir}"/>
<jar destfile="${target.deliverables.jars.dir}/${project.filename}"
basedir="${target.classes.dir}"
- includes="**/*.class,**/*.xml,**/*.properties,**/*.dtd"
+ includes="**/*.*"
excludes="**/*.html,**/*.gif,**/*.png">
<manifest>
- <attribute name="Created-By" value="The Digital Product Meta
Library."/>
+ <attribute name="Created-By" value="The Digital Product Management
Laboratory."/>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Extension-Name" value="${project.name}"/>
<attribute name="Specification-Vendor" value="DPML"/>
@@ -449,8 +449,7 @@
<mkdir dir="${target.test-classes.dir}"/>
<javac srcdir="${target.build.test.dir}"
destdir="${target.test-classes.dir}"
- debug="true"
- source="1.4" target="1.4">
+ debug="true">
<classpath refid="project.test.path"/>
</javac>
</target>
@@ -466,7 +465,10 @@
showoutput="true"
haltonfailure="yes" failureproperty="junit.failure"
haltonerror="yes" errorproperty="junit.error">
+ <sysproperty key="java.util.logging.config.class"
value="dpml.util.ConfigurationHandler"/>
+ <sysproperty key="dpml.logging.config"
value="file:${target.test.dir}/logging.properties"/>
<sysproperty key="build.signature" value="${build.signature}"/>
+ <sysproperty key="basedir" value="${basedir}"/>
<sysproperty key="project.basedir" value="${basedir}"/>
<sysproperty key="project.test.dir" value="${target.test.dir}"/>
<sysproperty key="project.version" value="${project.version}"/>

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2007-02-08 23:35:00 UTC (rev 1823)
+++ trunk/main/build.xml 2007-02-08 23:35:42 UTC (rev 1824)
@@ -18,9 +18,7 @@
-->

<project name="dpml" default="install"
- xmlns:transit="antlib:net.dpml.transit"
- xmlns:x="dpml:depot"
- xmlns:c="dpml:metro">
+ xmlns:x="antlib:dpml.tools">

<property environment="ENV"/>

@@ -28,7 +26,7 @@
<isset property="ENV.NSIS_HOME"/>
</condition>

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

<target name="prepare" depends="standard.prepare">
<property name="bundle" location="${project.target.dir}/bundle"/>
@@ -42,7 +40,7 @@
<mkdir dir="${share.docs}"/>
</target>

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

<target name="install" depends="standard.install,zip,tar,nsis">
<copy todir="${dpml.data}">
@@ -61,7 +59,7 @@
<property name="share.local" location="${share}/local"/>
<x:replicate self="true" toDir="${share.local}" layout="modern"/>
<x:replicate self="true" toDir="${share.local}" layout="modern"
ref="junit"/>
- <x:replicate self="true" toDir="${share.local}" layout="modern"
ref="ant"/>
+ <x:replicate self="true" toDir="${share.local}" layout="modern"
ref="org/apache/ant"/>
</target>

<target name="nsis" depends="bundle,replicate" if="nsis.available">
@@ -107,7 +105,6 @@
<include name="share/bin/build"/>
<include name="share/bin/station"/>
<include name="share/bin/metro"/>
- <include name="share/bin/transit"/>
<include name="share/bin/*.sh"/>
</tarfileset>
<tarfileset dir="target/bundle" prefix="dpml">
@@ -115,7 +112,6 @@
<exclude name="share/bin/build"/>
<exclude name="share/bin/station"/>
<exclude name="share/bin/metro"/>
- <exclude name="share/bin/transit"/>
<exclude name="share/bin/*.sh"/>
<exclude name="share/bin/*.lap"/>
<exclude name="share/bin/*.exe"/>
@@ -138,98 +134,63 @@
</copy>
</target>

- 
-
<target name="data" depends="prepare">
<mkdir dir="${data}/cache"/>
<mkdir dir="${data}/work"/>
<mkdir dir="${data}/logs/station"/>
- <mkdir dir="${data}/logs/transit"/>
<mkdir dir="${data}/temp"/>
</target>

<target name="lib" depends="prepare">
- <mkdir dir="${share.lib}"/>
- <copy todir="${share.lib}">
- <fileset dir="${dpml.system}/lib"/>
- </copy>
+ <mkdir dir="${share.lib}/ext"/>
+ <mkdir dir="${share.lib}/endorced"/>
+ <x:property name="transit.path" ref="dpml/transit/dpml-transit-main"
feature="path" type="jar"/>
+ <copy file="${transit.path}"
tofile="${share.lib}/ext/dpml-transit-main.jar"/>
</target>

<target name="prefs" depends="prepare">
+ <x:property name="transit.main.basedir"
ref="dpml/transit/dpml-transit-main" feature="basedir"/>
+ <x:property name="depot.builder.basedir"
ref="dpml/depot/dpml-depot-builder" feature="basedir"/>
+ <x:property name="depot.checkstyle.basedir"
ref="dpml/depot/dpml-depot-checkstyle" feature="basedir"/>
<property name="prefs.transit" location="${prefs}/dpml/transit"/>
<mkdir dir="${prefs.transit}"/>
<copy todir="${prefs.transit}" filtering="false">
- <fileset dir="transit/core/target/prefs">
+ <fileset dir="${transit.main.basedir}/target/prefs">
<include name="**/*"/>
</fileset>
</copy>
<property name="prefs.tools" location="${prefs}/dpml/tools"/>
<mkdir dir="${prefs.tools}"/>
<copy todir="${prefs.tools}" filtering="false">
- <fileset dir="depot/tools/target/prefs">
+ <fileset dir="${depot.builder.basedir}/target/prefs">
<include name="**/*"/>
</fileset>
- <fileset dir="depot/plugins/checkstyle/target/prefs">
+ <fileset dir="${depot.checkstyle.basedir}/target/prefs">
<include name="**/*"/>
</fileset>
</copy>
- <property name="prefs.metro" location="${prefs}/dpml/metro"/>
- <mkdir dir="${prefs.metro}"/>
- <copy todir="${prefs.metro}" filtering="false">
- <fileset dir="station/exec/target/prefs">
- <include name="**/*"/>
- </fileset>
- <fileset dir="metro/tools/target/prefs">
- <include name="**/*"/>
- </fileset>
- </copy>
- <property name="prefs.station" location="${prefs}/dpml/station"/>
+ <property name="prefs.station" location="${prefs}/dpml/metro"/>
+ <x:property name="station.main.basedir"
ref="dpml/metro/dpml-metro-station" feature="basedir"/>
<mkdir dir="${prefs.station}"/>
<copy todir="${prefs.station}" filtering="false">
- <fileset dir="station/server/target/prefs">
+ <fileset dir="${station.main.basedir}/target/prefs">
<include name="**/*"/>
</fileset>
</copy>
- <property name="prefs.http" location="${prefs}/dpml/planet/http"/>
- <mkdir dir="${prefs.http}"/>
- <copy todir="${prefs.http}" filtering="false">
- <fileset dir="planet/http/server/target/prefs">
- <include name="**/*"/>
- </fileset>
- </copy>
</target>

<target name="bin" depends="prepare">
+ <x:property name="build.basedir" ref="dpml/depot/dpml-depot-build"
feature="basedir"/>
+ <x:property name="metro.basedir" ref="dpml/metro/dpml-metro-main"
feature="basedir"/>
+ <x:property name="part.basedir" ref="dpml/lang/dpml-lang-part"
feature="basedir"/>
+ <x:property name="station.basedir" ref="dpml/metro/dpml-metro-station"
feature="basedir"/>
<property name="share.bin" location="${share}/bin"/>
<mkdir dir="${share.bin}"/>
<copy todir="${share.bin}" filtering="false">
- <fileset dir="transit/console/target/bin"/>
- <fileset dir="depot/core/target/bin"/>
- <fileset dir="depot/build/target/bin"/>
- <fileset dir="station/console/target/bin"/>
- <fileset dir="station/server/target/bin"/>
- <fileset dir="station/exec/target/bin"/>
+ <fileset dir="${part.basedir}/target/bin"/>
+ <fileset dir="${build.basedir}/etc/bin"/>
+ <fileset dir="${metro.basedir}/etc/bin"/>
+ <fileset dir="${station.basedir}/etc/bin"/>
</copy>
</target>

@@ -238,7 +199,7 @@
<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"/>
+ <task class="dpml.tools.checkstyle.CheckstyleTask" name="checkstyle"/>
</x:plugin>
<mkdir dir="${checkstyle.dir}"/>
<checkstyle>
@@ -251,4 +212,34 @@
</xslt>
</target>

+
+ <target name="javadoc" depends="init">
+ <property name="title" value="DPML SDK Version: ${project.version}"/>
+ <x:javadoc title="${title}"
+ Windowtitle="${title}"
+ access="protected">
+ <link href="http://java.sun.com/javase/6/docs/api"/>
+ <link href="http://api.dpml.net/javax/servlet/2.5"/>
+ <link href="http://api.dpml.net/org/mortbay/jetty/6.0.0"/>
+ <group title="Metro">
+ <package name="net.dpml.annotation"/>
+ <package name="net.dpml.appliance"/>
+ <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"/>
+ <package name="net.dpml.station"/>
+ </group>
+ <group title="Transit">
+ <package name="net.dpml.transit"/>
+ <package name="net.dpml.transit.*"/>
+ <package name="net.dpml.util"/>
+ </group>
+ <group title="Internal Packages">
+ <package name="dpml.*"/>
+ </group>
+ </x:javadoc>
+ </target>
+
</project>

r1824 - trunk/main, mcconnell at BerliOS, 02/08/2007