notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1705 - in trunk: central/site main main/depot main/depot/build main/depot/core main/depot/library main/depot/tools main/depot/tools/etc main/depot/tools/etc/bootstrap main/depot/tools/etc/deliverables main/depot/tools/src/main/net/dpml/tools/tasks main/lang/component main/lang/module main/lang/part main/lang/state main/lang/type main/metro main/planet/http/impl/src/main/net/dpml/http main/planet/http/impl/src/test/net/dpml/http main/station main/transit main/transit/console main/transit/core main/transit/tools
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1705 - in trunk: central/site main main/depot main/depot/build main/depot/core main/depot/library main/depot/tools main/depot/tools/etc main/depot/tools/etc/bootstrap main/depot/tools/etc/deliverables main/depot/tools/src/main/net/dpml/tools/tasks main/lang/component main/lang/module main/lang/part main/lang/state main/lang/type main/metro main/planet/http/impl/src/main/net/dpml/http main/planet/http/impl/src/test/net/dpml/http main/station main/transit main/transit/console main/transit/core main/transit/tools
- Date: Wed, 2 Aug 2006 21:59:36 +0200
Author: mcconnell
Date: 2006-08-02 21:59:28 +0200 (Wed, 02 Aug 2006)
New Revision: 1705
Added:
trunk/main/depot/build/bootstrap.xml
trunk/main/depot/core/bootstrap.xml
trunk/main/depot/library/build.xml
trunk/main/depot/tools/build.xml
trunk/main/depot/tools/etc/bootstrap/
trunk/main/depot/tools/etc/bootstrap/builder.xml
trunk/main/lang/component/build.xml
trunk/main/lang/module/build.xml
trunk/main/lang/part/build.xml
trunk/main/lang/state/build.xml
trunk/main/lang/type/build.xml
trunk/main/transit/core/build.xml
trunk/main/transit/tools/build.xml
Removed:
trunk/main/depot/tools/etc/bootstrap/builder.xml
trunk/main/depot/tools/etc/deliverables/parts/
Modified:
trunk/central/site/build.xml
trunk/main/BUILD.TXT
trunk/main/bootstrap.bat
trunk/main/depot/build/build.xml
trunk/main/depot/core/build.xml
trunk/main/depot/module.xml
trunk/main/depot/tools/bootstrap.xml
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/InstallTask.java
trunk/main/metro/module.xml
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
trunk/main/station/module.xml
trunk/main/transit/console/build.xml
trunk/main/transit/module.xml
Log:
Completion of the build procedure update.
Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/central/site/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -69,7 +69,7 @@
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"/>
+ <link href="http://api.dpml.net/org/mortbay/jetty/6.0.0-RC0"/>
<group title="Library">
<package name="net.dpml.library"/>
<package name="net.dpml.library.*"/>
Modified: trunk/main/BUILD.TXT
===================================================================
--- trunk/main/BUILD.TXT 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/BUILD.TXT 2006-08-02 19:59:28 UTC (rev 1705)
@@ -31,12 +31,12 @@
%DPML_HOME%/share/bin. To successfull invoke the build command the bin
directory must be included in your PATH environment variable.
- $ cd dev\dpml
$ build
The build procedure will build approximately 42 projects during which a
number
-of downloads may occur. On completion the %DPML_HOME% should be fully
populated and
-operational.
+of downloads may occur. On completion the %DPML_HOME%\data\dist directory
will
+contain the distribution archives for the installation. Unpack the archive
+corresponding to your platform into the %DPML_HOME% root directory.
Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/bootstrap.bat 2006-08-02 19:59:28 UTC (rev 1705)
@@ -129,13 +129,13 @@
:depot-build
PUSHD depot\build
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:depot-core
PUSHD depot\core
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
Added: trunk/main/depot/build/bootstrap.xml
===================================================================
--- trunk/main/depot/build/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
+++ trunk/main/depot/build/bootstrap.xml 2006-08-02 19:59:28 UTC (rev
1705)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-library-console" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <available property="builder.exe.available"
file="${dpml.system}/bin/build.exe"/>
+
+ <target name="install" depends="bin,standard.install">
+ <copy todir="${dpml.system}" preservelastmodified="true"
overwrite="true">
+ <fileset dir="target">
+ <include name="bin/build.lap"/>
+ <include name="bin/build"/>
+ </fileset>
+ </copy>
+ <chmod perm="755">
+ <fileset dir="${dpml.system}/bin">
+ <include name="build"/>
+ </fileset>
+ </chmod>
+ </target>
+
+ <target name="bin" depends="standard.install"
unless="builder.exe.available">
+ <copy todir="${dpml.system}" preservelastmodified="true">
+ <fileset dir="target">
+ <include name="bin/build.exe"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Modified: trunk/main/depot/build/build.xml
===================================================================
--- trunk/main/depot/build/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/build/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -6,28 +6,4 @@
<transit:import uri="local:template:dpml/tools/standard"/>
- <available property="builder.exe.available"
file="${dpml.system}/bin/build.exe"/>
-
- <target name="install" depends="bin,standard.install">
- <copy todir="${dpml.system}" preservelastmodified="true"
overwrite="true">
- <fileset dir="target">
- <include name="bin/build.lap"/>
- <include name="bin/build"/>
- </fileset>
- </copy>
- <chmod perm="755">
- <fileset dir="${dpml.system}/bin">
- <include name="build"/>
- </fileset>
- </chmod>
- </target>
-
- <target name="bin" depends="standard.install"
unless="builder.exe.available">
- <copy todir="${dpml.system}" preservelastmodified="true">
- <fileset dir="target">
- <include name="bin/build.exe"/>
- </fileset>
- </copy>
- </target>
-
</project>
Added: trunk/main/depot/core/bootstrap.xml
===================================================================
--- trunk/main/depot/core/bootstrap.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/core/bootstrap.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-depot-console" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="init" depends="standard.init">
+ <property name="depot.short.filename" value="${project.name}.jar"/>
+ </target>
+
+ <available property="depot.exe.available"
file="${dpml.system}/bin/depot.exe"/>
+
+ <target name="install" depends="standard.install,bin">
+ <property name="local" location="${dpml.system}/local"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${local}
+#----------------------------------------------------------------------------------
+ </echo>
+ <x:replicate self="true" verbose="false" layout="modern"
todir="${local}">
+ <include ref="dpml/depot/dpml-tools-builder"/>
+ <include ref="dpml/depot/dpml-library"/>
+ <include ref="dpml/lang/dpml-part"/>
+ </x:replicate>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${dpml.system}/lib
+#----------------------------------------------------------------------------------
+ </echo>
+ <property name="lib" location="${dpml.system}/lib"/>
+ <mkdir dir="${lib}"/>
+ <delete verbose="true" failonerror="false">
+ <fileset dir="${lib}">
+ <include name="${project.name}-*.*"/>
+ <exclude name="${depot.short.filename}"/>
+ </fileset>
+ </delete>
+ <property name="depot.long.filename"
value="${project.name}-${project.version}.jar"/>
+ <copy toFile="${lib}/${depot.short.filename}"
preservelastmodified="true" overwrite="true"
+ file="${basedir}/target/deliverables/jars/${depot.long.filename}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${dpml.system}/lib/endorsed
+#----------------------------------------------------------------------------------
+ </echo>
+ <transit:get uri="artifact:jar:org/apache/xml/xerces#2.8.0"
property="xerces.path"/>
+ <transit:get uri="artifact:jar:org/apache/xml/xml-apis#2.8.0"
property="xml-apis.path"/>
+ <transit:get uri="artifact:jar:org/apache/xml/xalan#2.7.0"
property="xalan.path"/>
+ <transit:get uri="artifact:jar:org/apache/xml/xalan-serializer#2.7.0"
property="serializer.path"/>
+ <mkdir dir="${lib}/endorsed"/>
+ <copy toDir="${lib}/endorsed" file="${xml-apis.path}"/>
+ <copy toDir="${lib}/endorsed" file="${xerces.path}"/>
+ <copy toDir="${lib}/endorsed" file="${xalan.path}"/>
+ <copy toDir="${lib}/endorsed" file="${serializer.path}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating ${dpml.system}/bin
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.system}" preservelastmodified="true"
overwrite="true">
+ <fileset dir="target">
+ <include name="bin/**"/>
+ <exclude name="bin/depot.exe"/>
+ </fileset>
+ </copy>
+ <chmod perm="755">
+ <fileset dir="${dpml.system}/bin">
+ <include name="**/*.sh"/>
+ <include name="**/depot"/>
+ </fileset>
+ </chmod>
+ <property name="work" location="${dpml.data}/work"/>
+ <mkdir dir="${work}"/>
+ </target>
+
+ <target name="bin" depends="prepare" unless="depot.exe.available">
+ <copy todir="${dpml.system}" preservelastmodified="true"
filtering="false">
+ <fileset dir="target">
+ <include name="bin/depot.exe"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Modified: trunk/main/depot/core/build.xml
===================================================================
--- trunk/main/depot/core/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/core/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -6,89 +6,4 @@
<transit:import uri="local:template:dpml/tools/standard"/>
- <target name="init" depends="standard.init">
- <property name="depot.short.filename" value="${project.name}.jar"/>
- </target>
-
- <!--
- BOOTSTRAP TARGETS
- The following targets are used to handle the setup of the ${dpml.home}
environment
- with the installation of Depot files in preparation for the deployment of
the
- main build phase. The target is called called from boostrap.bat file
following
- the build of transit and tools.
- -->
-
- <available property="depot.exe.available"
file="${dpml.system}/bin/depot.exe"/>
-
- <target name="install" depends="standard.install,bin">
- <property name="local" location="${dpml.system}/local"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating ${local}
-#----------------------------------------------------------------------------------
- </echo>
- <x:replicate self="true" verbose="false" layout="modern"
todir="${local}" >
- <include ref="dpml/depot/dpml-tools-builder"/>
- <include ref="dpml/depot/dpml-library"/>
- <include ref="dpml/lang/dpml-part"/>
- </x:replicate>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating ${dpml.system}/lib
-#----------------------------------------------------------------------------------
- </echo>
- <property name="lib" location="${dpml.system}/lib"/>
- <mkdir dir="${lib}"/>
- <delete verbose="true" failonerror="false">
- <fileset dir="${lib}">
- <include name="${project.name}-*.*"/>
- <exclude name="${depot.short.filename}"/>
- </fileset>
- </delete>
- <property name="depot.long.filename"
value="${project.name}-${project.version}.jar"/>
- <copy toFile="${lib}/${depot.short.filename}"
preservelastmodified="true" overwrite="true"
- file="${basedir}/target/deliverables/jars/${depot.long.filename}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating ${dpml.system}/lib/endorsed
-#----------------------------------------------------------------------------------
- </echo>
- <transit:get uri="artifact:jar:org/apache/xml/xerces#2.8.0"
property="xerces.path"/>
- <transit:get uri="artifact:jar:org/apache/xml/xml-apis#2.8.0"
property="xml-apis.path"/>
- <transit:get uri="artifact:jar:org/apache/xml/xalan#2.7.0"
property="xalan.path"/>
- <transit:get uri="artifact:jar:org/apache/xml/xalan-serializer#2.7.0"
property="serializer.path"/>
- <mkdir dir="${lib}/endorsed"/>
- <copy toDir="${lib}/endorsed" file="${xml-apis.path}"/>
- <copy toDir="${lib}/endorsed" file="${xerces.path}"/>
- <copy toDir="${lib}/endorsed" file="${xalan.path}"/>
- <copy toDir="${lib}/endorsed" file="${serializer.path}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating ${dpml.system}/bin
-#----------------------------------------------------------------------------------
- </echo>
- <copy todir="${dpml.system}" preservelastmodified="true"
overwrite="true">
- <fileset dir="target">
- <include name="bin/**"/>
- <exclude name="bin/depot.exe"/>
- </fileset>
- </copy>
- <chmod perm="755">
- <fileset dir="${dpml.system}/bin">
- <include name="**/*.sh"/>
- <include name="**/depot"/>
- </fileset>
- </chmod>
- <property name="work" location="${dpml.data}/work"/>
- <mkdir dir="${work}"/>
- </target>
-
- <target name="bin" depends="prepare" unless="depot.exe.available">
- <copy todir="${dpml.system}" preservelastmodified="true"
filtering="false">
- <fileset dir="target">
- <include name="bin/depot.exe"/>
- </fileset>
- </copy>
- </target>
-
</project>
Added: trunk/main/depot/library/build.xml
===================================================================
--- trunk/main/depot/library/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/library/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-library" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+</project>
Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/module.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -23,6 +23,13 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
+ <filters>
+ <feature token="MODULE-XSD-URI" ref="dpml/lang/dpml-module" id="uri"
type="xsd" alias="true"/>
+ <feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" id="uri"
type="xsd" alias="true"/>
+ <feature token="JUNIT_VERSION" ref="junit/junit" id="version"/>
+ <feature token="PROJECT_VERSION" id="version"/>
+ <feature token="ANT-BUILDER-URI" ref="dpml/depot/dpml-tools-builder"
id="uri" type="part" alias="true"/>
+ </filters>
</project>
<project name="dpml-library-build" basedir="build">
@@ -102,6 +109,23 @@
<include ref="ant/ant-trax" tag="system"/>
</runtime>
</dependencies>
+ <filters>
+ <feature token="PART-XSD-URI" id="uri" type="xsd" alias="true"
ref="dpml/lang/dpml-part" />
+ <feature token="PROJECT-URI" id="uri" type="part"/>
+ <feature token="PROJECT-LINK-URI" id="uri" type="part" alias="true"/>
+ <feature token="PROJECT-NAME" id="name"/>
+ <feature token="PROJECT-GROUP" id="group"/>
+ <feature token="PROJECT-VERSION" id="version"/>
+ <feature token="ANT-VERSION" id="version" ref="ant/ant"/>
+ <feature token="JUNIT-VERSION" id="version" ref="junit/junit"/>
+ <filter token="PLUGIN-CLASS"
value="net.dpml.tools.impl.StandardBuilder"/>
+ <feature token="DEPOT-CHECKSTYLE-PLUGIN-URI" id="uri" type="part"
ref="dpml/depot/dpml-depot-checkstyle" />
+ <feature token="DDEPOT-CHECKSTYLE-PLUGIN-LINK-URI" id="uri"
type="part" alias="true"
+ ref="dpml/depot/dpml-depot-checkstyle" />
+ <feature token="TRANSIT-CORE-VERSION" id="version"
ref="dpml/transit/dpml-transit-main"/>
+ <feature token="TRANSIT-TOOLS-VERSION" id="version"
ref="dpml/transit/dpml-transit-tools"/>
+ <feature token="LIBRARY-VERSION" id="version"
ref="dpml/depot/dpml-library"/>
+ </filters>
</project>
<project name="dpml-depot-checkstyle" basedir="plugins/checkstyle">
Modified: trunk/main/depot/tools/bootstrap.xml
===================================================================
--- trunk/main/depot/tools/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
+++ trunk/main/depot/tools/bootstrap.xml 2006-08-02 19:59:28 UTC (rev
1705)
@@ -47,9 +47,10 @@
</target>
<target name="package" depends="bootstrap.package">
- <move file="${target.deliverables.dir}/parts/builder.xml"
+ <mkdir dir="${target.deliverables.dir}/parts"/>
+ <move file="${target.dir}/bootstrap/builder.xml"
toFile="${target.deliverables.dir}/parts/${project.name}-${project.version}.part"/>
- <move file="${target.deliverables.dir}/parts/builder.link"
+ <move file="${target.dir}/bootstrap/builder.link"
toFile="${target.deliverables.dir}/parts/${project.name}.part.link"/>
</target>
Added: trunk/main/depot/tools/build.xml
===================================================================
--- trunk/main/depot/tools/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/tools/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-tools-builder" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <!--
+ -->
+ <target name="install" depends="standard.install">
+ <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
+ <mkdir dir="${tools.prefs}"/>
+ <copy toDir="${tools.prefs}">
+ <fileset dir="${project.target.dir}/prefs">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Copied: trunk/main/depot/tools/etc/bootstrap (from rev 1703,
trunk/main/depot/tools/etc/deliverables/parts)
Deleted: trunk/main/depot/tools/etc/bootstrap/builder.xml
===================================================================
--- trunk/main/depot/tools/etc/deliverables/parts/builder.xml 2006-08-02
15:49:14 UTC (rev 1703)
+++ trunk/main/depot/tools/etc/bootstrap/builder.xml 2006-08-02 19:59:28
UTC (rev 1705)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<part xmlns="@PART-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
- <info title="Depot Builder">
- <description>
- Ant project builder for Depot.
- </description>
- </info>
-
- <strategy xsi:type="plugin" class="@PLUGIN-CLASS@"/>
-
- <classpath>
- <system>
- <uri>artifact:jar:ant/ant-launcher#@ANT-VERSION@</uri>
- <uri>artifact:jar:ant/ant#@ANT-VERSION@</uri>
- <uri>artifact:jar:junit/junit#@JUNIT-VERSION@</uri>
- <uri>artifact:jar:ant/ant-junit#@ANT-VERSION@</uri>
- <uri>artifact:jar:ant/ant-xslp#@ANT-VERSION@</uri>
- <uri>artifact:jar:ant/ant-trax#@ANT-VERSION@</uri>
- </system>
- <private>
-
<uri>artifact:jar:dpml/transit/dpml-transit-main#@PROJECT-VERSION@</uri>
-
<uri>artifact:jar:dpml/transit/dpml-transit-tools#@PROJECT-VERSION@</uri>
- <uri>artifact:jar:dpml/depot/dpml-library#@PROJECT-VERSION@</uri>
-
<uri>artifact:jar:@PROJECT-GROUP@/@PROJECT-NAME@#@PROJECT-VERSION@</uri>
- </private>
- </classpath>
-
-</part>
Copied: trunk/main/depot/tools/etc/bootstrap/builder.xml (from rev 1704,
trunk/main/depot/tools/etc/deliverables/parts/builder.xml)
Modified:
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/InstallTask.java
===================================================================
--- trunk/main/depot/tools/src/main/net/dpml/tools/tasks/InstallTask.java
2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/depot/tools/src/main/net/dpml/tools/tasks/InstallTask.java
2006-08-02 19:59:28 UTC (rev 1705)
@@ -65,6 +65,7 @@
Resource resource = getResource();
String resourceVersion = resource.getVersion();
boolean snapshot = "SNAPSHOT".equals( resourceVersion );
+ boolean bootstrap = "BOOTSTRAP".equals( resourceVersion );
Type[] types = resource.getTypes();
if( types.length == 0 )
{
@@ -96,7 +97,7 @@
throw new BuildException( error, getLocation() );
}
- if( !snapshot )
+ if( !snapshot && !bootstrap )
{
try
{
@@ -232,7 +233,6 @@
+ "\n New: " + newValue;
throw new BuildException( error, getLocation() );
}
- System.out.println( "# CHECKSUM OK" );
}
private String getChecksum( File file )
Added: trunk/main/lang/component/build.xml
===================================================================
--- trunk/main/lang/component/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/lang/component/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-component" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="package" depends="standard.package">
+ <property name="target.file"
location="${project.target.dir}/component.xsd"/>
+ <property name="xsds.dir" location="${project.deliverable.xsd.dir}"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy file="${target.file}" toFile="${project.deliverable.xsd.path}"
+ preservelastmodified="true" overwrite="true"/>
+ <checksum fileext=".md5" file="${project.deliverable.xsd.path}"/>
+ </target>
+
+</project>
Added: trunk/main/lang/module/build.xml
===================================================================
--- trunk/main/lang/module/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/lang/module/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-module" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="package" depends="standard.package">
+ <property name="target.file"
location="${project.target.dir}/module.xsd"/>
+ <property name="xsds.dir" location="${project.deliverable.xsd.dir}"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy file="${target.file}" toFile="${project.deliverable.xsd.path}"
+ preservelastmodified="true" overwrite="true"/>
+ <checksum fileext=".md5" file="${project.deliverable.xsd.path}"/>
+ </target>
+
+</project>
Added: trunk/main/lang/part/build.xml
===================================================================
--- trunk/main/lang/part/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/lang/part/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-part" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="package" depends="standard.package">
+ <property name="target.file" location="${project.target.dir}/part.xsd"/>
+ <property name="xsds.dir" location="${project.deliverable.xsd.dir}"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy file="${target.file}" toFile="${project.deliverable.xsd.path}"
+ preservelastmodified="true" overwrite="true"/>
+ <checksum fileext=".md5" file="${project.deliverable.xsd.path}"/>
+ </target>
+
+</project>
Added: trunk/main/lang/state/build.xml
===================================================================
--- trunk/main/lang/state/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/lang/state/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-state" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="package" depends="standard.package">
+ <property name="target.file" location="${project.target.dir}/state.xsd"/>
+ <property name="xsds.dir" location="${project.deliverable.xsd.dir}"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy file="${target.file}" toFile="${project.deliverable.xsd.path}"
+ preservelastmodified="true" overwrite="true"/>
+ <checksum fileext=".md5" file="${project.deliverable.xsd.path}"/>
+ </target>
+
+</project>
Added: trunk/main/lang/type/build.xml
===================================================================
--- trunk/main/lang/type/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/lang/type/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-type" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="package" depends="standard.package">
+ <property name="target.file" location="${project.target.dir}/type.xsd"/>
+ <property name="xsds.dir" location="${project.deliverable.xsd.dir}"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy file="${target.file}" toFile="${project.deliverable.xsd.path}"
+ preservelastmodified="true" overwrite="true"/>
+ <checksum fileext=".md5" file="${project.deliverable.xsd.path}"/>
+ </target>
+
+</project>
Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/metro/module.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -16,6 +16,9 @@
<type id="jar"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-state"/>
+ </build>
<runtime>
<include ref="dpml/transit/dpml-transit-main"/>
</runtime>
@@ -36,6 +39,9 @@
<type id="jar"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-part"/>
+ </build>
<runtime>
<include key="dpml-metro-state" tag="public"/>
<include ref="dpml/transit/dpml-transit-main" tag="private"/>
@@ -60,6 +66,12 @@
<type id="jar"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-part"/>
+ <include ref="dpml/lang/dpml-state"/>
+ <include ref="dpml/lang/dpml-type"/>
+ <include ref="dpml/lang/dpml-component"/>
+ </build>
<runtime>
<include key="dpml-metro-state"/>
<include key="dpml-metro-component"/>
@@ -93,6 +105,12 @@
</part:plugin>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-part"/>
+ <include ref="dpml/lang/dpml-state"/>
+ <include ref="dpml/lang/dpml-type"/>
+ <include ref="dpml/lang/dpml-component"/>
+ </build>
<runtime>
<include ref="dpml/util/dpml-logging-api" tag="public"/>
<include ref="dpml/metro/dpml-metro-component" tag="protected"/>
@@ -124,6 +142,9 @@
path="net/dpml/metro/tools/antlib.xml"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-component"/>
+ </build>
<runtime>
<include ref="dpml/depot/dpml-tools-builder"/>
<include ref="dpml/transit/dpml-transit-tools"/>
Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
2006-08-02 19:59:28 UTC (rev 1705)
@@ -63,7 +63,7 @@
String[] hosts = context.getConnectors( null );
if( null != hosts )
{
- handler.setConnectors( hosts );
+ handler.setConnectorNames( hosts );
}
String[] virtual = context.getVirtualHosts( null );
Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
2006-08-02 17:07:53 UTC (rev 1704)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
2006-08-02 19:59:28 UTC (rev 1705)
@@ -43,7 +43,7 @@
* @param flag implementation defined default value
* @return the supplied policy unless overriden in the deployment
configuration
*/
- boolean getAssumeShortDispatch( boolean flag );
+ boolean getDelaySelectKeyUpdate( boolean flag );
}
/**
@@ -99,7 +99,7 @@
// SelectChannelConnector$Context
- boolean flag = context.getAssumeShortDispatch( ASSUME_SHORT_DISPATCH
);
- setAssumeShortDispatch( flag );
+ boolean flag = context.getDelaySelectKeyUpdate(
ASSUME_SHORT_DISPATCH );
+ setDelaySelectKeyUpdate( flag );
}
}
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
2006-08-02 17:07:53 UTC (rev 1704)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
2006-08-02 19:59:28 UTC (rev 1705)
@@ -87,7 +87,7 @@
*/
public void testConnectors() throws Exception
{
- String[] connectors = getContextHandler().getConnectors();
+ String[] connectors = getContextHandler().getConnectorNames();
if( !Arrays.equals( CONNECTORS, connectors ) )
{
final String error =
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
2006-08-02 17:07:53 UTC (rev 1704)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
2006-08-02 19:59:28 UTC (rev 1705)
@@ -43,7 +43,7 @@
{
Map map = createMap();
- map.put( "assumeShortDispatch", new Boolean(
ASSUME_SHORT_DISPATH_POLICY ) );
+ map.put( "delaySelectKeyUpdate", new Boolean(
ASSUME_SHORT_DISPATH_POLICY ) );
Class clazz = Context.class;
Context context = (Context)
ContextInvocationHandler.getProxiedInstance( clazz, map );
@@ -63,9 +63,9 @@
* Test min-thread assignment integrity.
* @throws Exception if an error occurs during test execution
*/
- public void testAssumeShortDispatch() throws Exception
+ public void testDelaySelectKeyUpdate() throws Exception
{
- assertEquals( "assumeShortDispatch", ASSUME_SHORT_DISPATH_POLICY,
m_connector.getAssumeShortDispatch() );
+ assertEquals( "delaySelectKeyUpdate", ASSUME_SHORT_DISPATH_POLICY,
m_connector.getDelaySelectKeyUpdate() );
}
}
Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/station/module.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -37,8 +37,13 @@
<type id="jar"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-part"/>
+ <include ref="dpml/lang/dpml-part"/>
+ <include ref="dpml/lang/dpml-component"/>
+ <include ref="dpml/station/dpml-station-info"/>
+ </build>
<runtime>
- <include ref="dpml/transit/dpml-transit-main"/>
<include ref="dpml/metro/dpml-metro-component"/>
</runtime>
<test>
@@ -88,6 +93,9 @@
<type id="jar"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/station/dpml-station-info"/>
+ </build>
<runtime>
<include key="dpml-station-api" tag="public"/>
</runtime>
@@ -113,6 +121,9 @@
<part:plugin class="net.dpml.station.server.StationServerPlugin"
alias="true"/>
</types>
<dependencies>
+ <build>
+ <include ref="dpml/station/dpml-station-info"/>
+ </build>
<runtime>
<include ref="dpml/depot/dpml-depot-console" tag="public"/>
<include ref="dpml/metro/dpml-metro-component" tag="public"/>
Modified: trunk/main/transit/console/build.xml
===================================================================
--- trunk/main/transit/console/build.xml 2006-08-02 17:07:53 UTC (rev
1704)
+++ trunk/main/transit/console/build.xml 2006-08-02 19:59:28 UTC (rev
1705)
@@ -22,6 +22,7 @@
<transit:import uri="local:template:dpml/tools/standard"/>
+ <!--
<available property="transit.exe.available"
file="${dpml.system}/bin/transit.exe"/>
<target name="install" depends="bin,standard.install">
@@ -45,5 +46,6 @@
</fileset>
</copy>
</target>
-
+ -->
+
</project>
Added: trunk/main/transit/core/build.xml
===================================================================
--- trunk/main/transit/core/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/transit/core/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-component" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+ <target name="build" depends="standard.build">
+ <rmic base="${project.target.classes.main.dir}"
classpathref="project.compile.path">
+ <include name="**/DefaultHostModel.class"/>
+ <include name="**/DefaultContentModel.class"/>
+ <include name="**/DefaultLayoutModel.class"/>
+ <include name="**/StandardLayoutModel.class"/>
+ <include name="**/DefaultCacheModel.class"/>
+ <include name="**/DefaultContentRegistryModel.class"/>
+ <include name="**/DefaultLayoutRegistryModel.class"/>
+ <include name="**/DefaultRepositoryModel.class"/>
+ <include name="**/DefaultTransitModel.class"/>
+ <include name="**/DefaultProxyModel.class"/>
+ <include name="**/DefaultCacheHandler.class"/>
+ <include name="**/DefaultContentRegistry.class"/>
+ <include name="**/DefaultLayoutRegistry.class"/>
+ <include name="**/DefaultResourceHost.class"/>
+ <include name="**/SecuredTransitContext$ProxyController.class"/>
+ <include name="**/SecuredTransitContext$DisposalController.class"/>
+ </rmic>
+ </target>
+
+ <target name="package" depends="standard.package">
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating Transit Prefs. ${dpml.prefs}/dpml/transit
+#----------------------------------------------------------------------------------
+ </echo>
+ <mkdir dir="${dpml.prefs}/dpml/transit"/>
+ <copy preservelastmodified="true" toDir="${dpml.prefs}/dpml/transit">
+ <fileset dir="${basedir}/target/prefs"/>
+ </copy>
+ </target>
+
+</project>
Modified: trunk/main/transit/module.xml
===================================================================
--- trunk/main/transit/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/transit/module.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -38,6 +38,21 @@
<types>
<type id="jar"/>
</types>
+ <dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-part"/>
+ </build>
+ <test>
+ <include key="dpml-transit-main"/>
+ <include ref="ant/ant-junit"/>
+ </test>
+ </dependencies>
+ <filters>
+ <feature token="PROJECT-NAME" id="name"/>
+ <feature token="PROJECT-GROUP" id="group"/>
+ <feature token="PROJECT-VERSION" id="version"/>
+ <feature token="PART-XSD-SPEC-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part" alias="true"/>
+ </filters>
</project>
<project name="dpml-transit-tools" basedir="tools">
Added: trunk/main/transit/tools/build.xml
===================================================================
--- trunk/main/transit/tools/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
+++ trunk/main/transit/tools/build.xml 2006-08-02 19:59:28 UTC (rev 1705)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-transit-tools" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot" >
+
+ <transit:import uri="local:template:dpml/tools/standard"/>
+
+</project>
- r1705 - in trunk: central/site main main/depot main/depot/build main/depot/core main/depot/library main/depot/tools main/depot/tools/etc main/depot/tools/etc/bootstrap main/depot/tools/etc/deliverables main/depot/tools/src/main/net/dpml/tools/tasks main/lang/component main/lang/module main/lang/part main/lang/state main/lang/type main/metro main/planet/http/impl/src/main/net/dpml/http main/planet/http/impl/src/test/net/dpml/http main/station main/transit main/transit/console main/transit/core main/transit/tools, mcconnell at BerliOS, 08/02/2006
Archive powered by MHonArc 2.6.24.