notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1704 - in trunk: . main main/depot main/depot/build/src/main/net/dpml/library/console main/depot/library main/depot/library/src/main/net/dpml/library/impl main/depot/library/src/main/net/dpml/library/info main/depot/tools main/depot/tools/etc/deliverables/parts main/depot/tools/src/main/net/dpml/tools/tasks main/lang main/lang/component main/lang/module main/lang/part main/lang/state main/lang/type main/metro main/planet main/planet/http main/station main/transit main/transit/core main/transit/core/src/main/net/dpml/transit/artifact main/transit/tools main/util
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1704 - in trunk: . main main/depot main/depot/build/src/main/net/dpml/library/console main/depot/library main/depot/library/src/main/net/dpml/library/impl main/depot/library/src/main/net/dpml/library/info main/depot/tools main/depot/tools/etc/deliverables/parts main/depot/tools/src/main/net/dpml/tools/tasks main/lang main/lang/component main/lang/module main/lang/part main/lang/state main/lang/type main/metro main/planet main/planet/http main/station main/transit main/transit/core main/transit/core/src/main/net/dpml/transit/artifact main/transit/tools main/util
- Date: Wed, 2 Aug 2006 19:09:30 +0200
Author: mcconnell
Date: 2006-08-02 19:07:53 +0200 (Wed, 02 Aug 2006)
New Revision: 1704
Added:
trunk/main/depot/library/bootstrap.properties
trunk/main/depot/library/bootstrap.xml
trunk/main/depot/tools/bootstrap.properties
trunk/main/depot/tools/bootstrap.xml
trunk/main/lang/component/bootstrap.properties
trunk/main/lang/component/bootstrap.xml
trunk/main/lang/module/bootstrap.properties
trunk/main/lang/module/bootstrap.xml
trunk/main/lang/part/bootstrap.properties
trunk/main/lang/part/bootstrap.xml
trunk/main/lang/state/bootstrap.properties
trunk/main/lang/state/bootstrap.xml
trunk/main/lang/type/bootstrap.properties
trunk/main/lang/type/bootstrap.xml
trunk/main/transit/core/bootstrap.properties
trunk/main/transit/core/bootstrap.xml
trunk/main/transit/tools/bootstrap.properties
trunk/main/transit/tools/bootstrap.xml
Removed:
trunk/main/ISSUES.TXT
trunk/main/depot/library/build.properties
trunk/main/depot/library/build.xml
trunk/main/depot/tools/build.properties
trunk/main/depot/tools/build.xml
trunk/main/lang/component/build.properties
trunk/main/lang/component/build.xml
trunk/main/lang/module/build.properties
trunk/main/lang/module/build.xml
trunk/main/lang/part/build.properties
trunk/main/lang/part/build.xml
trunk/main/lang/state/build.properties
trunk/main/lang/state/build.xml
trunk/main/lang/type/build.properties
trunk/main/lang/type/build.xml
trunk/main/transit/core/build.properties
trunk/main/transit/core/build.xml
trunk/main/transit/tools/build.properties
trunk/main/transit/tools/build.xml
Modified:
trunk/index.xml
trunk/main/BUILD.TXT
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/bootstrap.xml
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
trunk/main/depot/module.xml
trunk/main/depot/tools/etc/deliverables/parts/builder.xml
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/InstallTask.java
trunk/main/lang/module.xml
trunk/main/metro/module.xml
trunk/main/planet/http/module.xml
trunk/main/planet/module.xml
trunk/main/station/module.xml
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
trunk/main/transit/module.xml
trunk/main/util/module.xml
Log:
Update to the build procedure to structure the bootstrap phase as an
exclusive SNAPSHOT build from which a depot-based build of all resources can
be initiated (this has involved some updates to the bootstrap scripts and the
expansion of index to include full <project> definitions for all DPML
projects. Depot-based build procedures for resources previously handled by
the bootstrap phase will be added in a subsequent commit.
Modified: trunk/index.xml
===================================================================
--- trunk/index.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/index.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -26,7 +26,7 @@
<property name="project.version-postfix.enabled" value="false"/>
<property name="project.major.version" value="1"/>
<property name="project.minor.version" value="0"/>
- <property name="project.micro.version" value="0"/>
+ <property name="project.micro.version" value="1"/>
</properties>
<types>
Modified: trunk/main/BUILD.TXT
===================================================================
--- trunk/main/BUILD.TXT 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/BUILD.TXT 2006-08-02 17:07:53 UTC (rev 1704)
@@ -17,6 +17,8 @@
Create a directory to hold the svn codebase (e.g. c:\dev\dpml\main),
checkout
the sources, cd to the main directory and invoke the bootstrap build
procedure.
+The bootstrap procedure invokes a SNAPSHOT build on all resources necessary
to
+establish the build tool.
$ cd dev\dpml\main
$ svn checkout svn://svn.berlios.de/dpml/trunk/main
@@ -32,7 +34,7 @@
$ cd dev\dpml
$ build
-The build procedure will build approximately 40 projects during which a
number
+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.
Deleted: trunk/main/ISSUES.TXT
===================================================================
--- trunk/main/ISSUES.TXT 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/ISSUES.TXT 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,19 +0,0 @@
-
-Current issues
---------------
-
-1. Build System Declaration
-
- Current implementation allows for the defintion of a build system
- implementation to be used by the builder when invoking a build
- sequence. While allowing for the potential of replaceable build
- strategies, the implementation needs to be extended to supporting
- multiple coexistant build strategies with defintion at the library,
- module and/or project levels.
-
-
-
-
-
-
-
Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/bootstrap 2006-08-02 17:07:53 UTC (rev 1704)
@@ -15,18 +15,7 @@
{
STATUS=99
while [ "$STATUS" -eq 99 ] ; do
- if [ -n "$ID" ] ; then
- BUILD_ID="-Dbuild.signature=$ID"
- else
- BUILD_ID=""
- fi
- if [ -n "$SPEC" ] ; then
- SPEC_ID="-Dbuild.decimal=$SPEC"
- else
- SPEC_ID=""
- fi
- echo "building project with with spec [$SPEC] and release ID [$ID]"
- ant $SPEC_ID $BUILD_ID "$@"
+ ant $BUILD_ID "$@"
STATUS="$?"
done
if [ "$STATUS" == 0 ] ; then
@@ -50,63 +39,63 @@
dpmlModule()
{
cd lang/module
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
dpmlPart()
{
cd lang/part
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
dpmlState()
{
cd lang/state
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
dpmlComponent()
{
cd lang/component
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
dpmlType()
{
cd lang/type
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
transitMain()
{
cd transit/core
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
transitTools()
{
cd transit/tools
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
dpmlLibrary()
{
cd depot/library
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
depotAntBuilder()
{
cd depot/tools
- build clean install
+ build -f bootstrap.xml clean install
cd ../..
}
@@ -139,7 +128,6 @@
}
ID=$1
-SPEC=$2
antlibCleanup
xmlSetup
dpmlModule
Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/bootstrap.bat 2006-08-02 17:07:53 UTC (rev 1704)
@@ -9,16 +9,12 @@
REM
REM Usage:
REM ------
-REM bootstrap 1.0.0 1234
REM
-REM or
-REM
REM bootstrap
REM
set ARG_ONE=%1
-set ARG_TWO=%2
CALL :antlib-cleanup
IF ERRORLEVEL 1 GOTO :exit
CALL :xml-setup
@@ -67,55 +63,55 @@
:dpml-module
PUSHD lang\module
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:dpml-part
PUSHD lang\part
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:dpml-state
PUSHD lang\state
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:dpml-component
PUSHD lang\component
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:dpml-type
PUSHD lang\type
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:transit-main
PUSHD transit\core
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:transit-tools
PUSHD transit\tools
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:dpml-library
PUSHD depot\library
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
:depot-ant-builder
PUSHD depot\tools
-CALL :build clean install
+CALL :build -f bootstrap.xml clean install
POPD
GOTO :EOF
@@ -145,33 +141,10 @@
:build
-REM if %ARG_TWO% is undefined then %SPEC_ID% is undefined and %BUILD_ID% is
%ARG_ONE%
-
-SET SPEC_ID=""
-SET BUILD_ID=""
-
-IF NOT "%ARG_TWO%" == "" GOTO SETUP_WITH_TWO_ARGS
-IF "%ARG_TWO%" == "" GOTO SETUP_WITH_ONE_ARGS
-
-:SETUP_WITH_ONE_ARGS
-SET BUILD_ID=-Dbuild.signature=%ARG_ONE%
-GOTO EXECUTE
-
-:SETUP_WITH_TWO_ARGS
-SET SPEC_ID=-Dbuild.decimal=%ARG_ONE%
-SET BUILD_ID=-Dbuild.signature=%ARG_TWO%
-GOTO EXECUTE
-
-
-:EXECUTE
-ECHO ### START BUILD ###
@echo on
CD
@echo off
-ECHO building project with [%SPEC_ID%] and [%BUILD_ID%]
-CALL ant %SPEC_ID% %BUILD_ID% %*
-SET SPEC_ID=""
-SET BUILD_ID=""
+CALL ant %*
goto :EOF
Modified: trunk/main/bootstrap.xml
===================================================================
--- trunk/main/bootstrap.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/bootstrap.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -31,6 +31,7 @@
<property file="${user.home}/ant.properties"/>
<property file="${basedir}/user.properties"/>
<property file="${basedir}/build.properties"/>
+ <property file="${basedir}/bootstrap.properties"/>
<property name="home" location=""/>
<property file="${home}/user.properties"/>
<property file="${home}/bootstrap.properties"/>
@@ -146,10 +147,6 @@
<isset property="build.signature"/>
</condition>
- <condition property="decimal.declared" value="true">
- <isset property="build.decimal"/>
- </condition>
-
<property name="src" value="src"/>
<property name="src.main" value="main"/>
<property name="src.main.dir" value="${src}/${src.main}"/>
@@ -177,20 +174,20 @@
<property name="target.deliverables.dir"
location="${target.dir}/deliverables"/>
<property name="target.deliverables.jars.dir"
location="${target.deliverables.dir}/jars"/>
- <target name="setupReleasePrefix" if="decimal.declared">
- <property name="project.prefix" value="${build.decimal}-"/>
+ <!--
+ <target name="setupVersionedFilename" unless="signature.declared">
+ <loadfile property="project.version" srcFile="${basedir}/VERSION.TXT"/>
</target>
- <target name="setupReleaseFilename" depends="setupReleasePrefix"
if="signature.declared">
- <property name="project.prefix" value=""/>
- <property name="project.version"
value="${project.prefix}${build.signature}"/>
+ <target name="setupReleaseFilename" depends="setupVersionedFilename"
if="signature.declared">
+ <property name="project.version" value="${build.signature}"/>
</target>
-
- <target name="init" depends="setup,setupReleaseFilename">
+ -->
+
+ <target name="init" depends="setup">
<property name="project.version" value="SNAPSHOT"/>
<property name="build.signature" value="SNAPSHOT"/>
<property name="project.filename"
value="${project.name}-${project.version}.${project.type}"/>
- <property name="dpml-transit-handler.filename"
value="dpml-transit-main-${project.version}.jar"/>
<echo>
#----------------------------------------------------------------------------------
# ${project.group}/${project.name}#${project.version}
Modified:
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
===================================================================
---
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
2006-08-02 15:49:14 UTC (rev 1703)
+++
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -61,9 +61,15 @@
public class BuilderPlugin
{
//
------------------------------------------------------------------------
+ // static
+ //
------------------------------------------------------------------------
+
+ private static final URI ANT_BUILDER_URI;
+
+ //
------------------------------------------------------------------------
// state
//
------------------------------------------------------------------------
-
+
private final Logger m_logger;
private final DefaultLibrary m_library;
private final Map m_map = new Hashtable();
@@ -87,17 +93,28 @@
throws Exception
{
m_logger = logger;
- m_library = new DefaultLibrary( logger );
Thread.currentThread().setContextClassLoader(
Builder.class.getClassLoader() );
- Parser parser = new Parser();
- parser.setGroup( COMMAND_GROUP );
+ CommandLine line = getCommandLine( args );
+ m_verbose = line.hasOption( VERBOSE_OPTION );
+ // setup the build version
+
+ if( line.hasOption( VERSION_OPTION ) )
+ {
+ String version = (String) line.getValue( VERSION_OPTION,
"SNAPSHOT" );
+ System.setProperty( "build.signature", version );
+ if( m_verbose )
+ {
+ getLogger().info( "Setting version to: " + version );
+ }
+ }
+
+ m_library = new DefaultLibrary( logger );
+
try
{
- CommandLine line = parser.parse( args );
- m_verbose = line.hasOption( VERBOSE_OPTION );
if( line.hasOption( HELP_OPTION ) )
{
processHelp();
@@ -105,18 +122,6 @@
}
else
{
- // setup the build version
-
- if( line.hasOption( VERSION_OPTION ) )
- {
- String version = (String) line.getValue( VERSION_OPTION,
"SNAPSHOT" );
- System.setProperty( "build.signature", version );
- if( m_verbose )
- {
- getLogger().info( "Setting version to: " + version );
- }
- }
-
if( line.hasOption( LIST_OPTION ) )
{
m_expand = line.hasOption( EXPAND_OPTION );
@@ -157,6 +162,13 @@
}
}
+ private CommandLine getCommandLine( String[] args ) throws Exception
+ {
+ Parser parser = new Parser();
+ parser.setGroup( COMMAND_GROUP );
+ return parser.parse( args );
+ }
+
private Part createPart( URI uri ) throws Exception
{
try
@@ -275,10 +287,6 @@
private boolean process( CommandLine line, Resource[] resources ) throws
Exception
{
URI uri = (URI) line.getValue( BUILDER_URI_OPTION, ANT_BUILDER_URI );
-
- Part part = createPart( uri );
- Builder builder = createBuilder( part );
-
if( resources.length > 1 )
{
StringBuffer buffer =
@@ -297,6 +305,8 @@
for( int i=0; i<resources.length; i++ )
{
Resource resource = resources[i];
+ Part part = createPart( uri );
+ Builder builder = createBuilder( part );
boolean status = builder.build( resource, targets );
if( !status )
{
@@ -306,21 +316,7 @@
}
return true;
}
-
- private static final URI ANT_BUILDER_URI;
- static
- {
- try
- {
- ANT_BUILDER_URI = new URI( "@ANT-BUILDER-URI@" );
- }
- catch( Exception e )
- {
- throw new RuntimeException( "will not happen", e );
- }
- }
-
/**
* Build the supplied set of projects. If a build filure occurs then
* abort the build sequence and exit.
@@ -613,5 +609,18 @@
.withOption( BUILD_GROUP )
.withOption( TARGETS )
.create();
+
+ static
+ {
+ try
+ {
+ ANT_BUILDER_URI = new URI( "@ANT-BUILDER-URI@" );
+ }
+ catch( Exception e )
+ {
+ throw new RuntimeException( "will not happen", e );
+ }
+ }
+
}
Copied: trunk/main/depot/library/bootstrap.properties (from rev 1702,
trunk/main/depot/library/build.properties)
Copied: trunk/main/depot/library/bootstrap.xml (from rev 1702,
trunk/main/depot/library/build.xml)
===================================================================
--- trunk/main/depot/library/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/depot/library/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-library" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit" >
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="project.xsd.version" value="${project.version}"/>
+ <filter token="MODULE-XSD-URI"
value="link:xsd:dpml/lang/dpml-module#1.0"/>
+ <filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter value="${junit.version}" token="JUNIT_VERSION"/>
+ <filter value="${project.version}" token="PROJECT-VERSION"/>
+ <filter value="link:part:dpml/depot/dpml-tools-builder"
token="ANT-BUILDER-URI"/>
+ </target>
+
+ <target name="setup-path" depends="bootstrap.setup-path">
+ <transit:get property="junit.path" uri="${junit.uri}"/>
+ <transit:get property="transit.path"
uri="artifact:jar:dpml/transit/dpml-transit-main#SNAPSHOT"/>
+ <path id="project.main.path">
+ <pathelement
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-SNAPSHOT.jar"/>
+ <pathelement location="${target.classes.dir}"/>
+ </path>
+ <path id="project.test.path">
+ <pathelement location="${junit.path}"/>
+ <pathelement location="${transit.path}"/>
+ <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
+ </path>
+ </target>
+
+</project>
+
Deleted: trunk/main/depot/library/build.properties
===================================================================
--- trunk/main/depot/library/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/depot/library/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,7 +0,0 @@
-
-project.group = dpml/depot
-project.name = dpml-library
-project.test.fork = true
-junit.version = 3.8.1
-junit.filename = junit-${junit.version}.jar
-junit.uri = artifact:jar:junit/junit#${junit.version}
Deleted: trunk/main/depot/library/build.xml
===================================================================
--- trunk/main/depot/library/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/depot/library/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="dpml-library" default="install" basedir="."
- xmlns:transit="antlib:net.dpml.transit" >
-
- <property file="${basedir}/build.properties"/>
- <transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
-
- <target name="init" depends="bootstrap.init">
- <property name="project.xsd.version" value="${project.version}"/>
- <filter token="MODULE-XSD-URI"
value="link:xsd:dpml/lang/dpml-module#1.0"/>
- <filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
- <filter value="${junit.version}" token="JUNIT_VERSION"/>
- <filter value="${project.version}" token="PROJECT-VERSION"/>
- <filter value="link:part:dpml/depot/dpml-tools-builder"
token="ANT-BUILDER-URI"/>
- </target>
-
- <target name="setup-path" depends="bootstrap.setup-path">
- <transit:get property="junit.path" uri="${junit.uri}"/>
- <transit:get property="transit.path"
uri="artifact:jar:dpml/transit/dpml-transit-main#${project.version}"/>
- <path id="project.main.path">
- <pathelement
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-${dpml.transit.version}.jar"/>
- <pathelement location="${target.classes.dir}"/>
- </path>
- <path id="project.test.path">
- <pathelement location="${junit.path}"/>
- <pathelement location="${transit.path}"/>
- <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
- </path>
- </target>
-
-</project>
-
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-08-02 15:49:14 UTC (rev 1703)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -390,11 +390,11 @@
String elem = elements[i];
if( i == ( elements.length-1 ) )
{
- enclosing = new ModuleDirective( elem, resourceDirective );
+ enclosing = new ModuleDirective( elem, version,
resourceDirective );
}
else
{
- enclosing = new ModuleDirective( elem, enclosing );
+ enclosing = new ModuleDirective( elem, version, enclosing );
}
}
try
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-08-02 15:49:14 UTC (rev 1703)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -79,10 +79,20 @@
public static final String SNAPSHOT = "SNAPSHOT";
/**
+ * Constant BOOTSTRAP symbol.
+ */
+ public static final String BOOTSTRAP = "BOOTSTRAP";
+
+ /**
* Constant RELEASE symbol.
*/
public static final String RELEASE = "RELEASE";
+ /**
+ * Constant ANONYMOUS version symbol.
+ */
+ public static final String ANONYMOUS = "ANONYMOUS";
+
private final DefaultLibrary m_library;
private final ResourceDirective m_directive;
private final DefaultModule m_parent;
@@ -206,9 +216,11 @@
String version = getVersion();
if( null != version )
{
- setProperty( "project.version", getVersion() );
+ setProperty( "project.version", version );
}
+ // setup filters
+
FilterDirective[] filters = directive.getFilterDirectives();
for( int i=0; i<filters.length; i++ )
{
@@ -262,25 +274,14 @@
*/
public String getVersion()
{
- if( null == m_directive )
+ String version = getStatutoryVersion();
+ if( null != version )
{
- return getStandardVersion();
+ return version;
}
- if( ResourceDirective.ANONYMOUS.equals( getClassifier() ) )
- {
- return m_directive.getVersion();
- }
else
{
- String version = getStatutoryVersion();
- if( null != version )
- {
- return version;
- }
- else
- {
- return getStandardVersion();
- }
+ return getStandardVersion();
}
}
@@ -307,6 +308,10 @@
{
return m_parent.getStatutoryVersion();
}
+ else if( !m_directive.getClassifier().equals(
Classifier.LOCAL ) )
+ {
+ return ANONYMOUS;
+ }
else
{
return null;
@@ -1402,6 +1407,10 @@
{
return value;
}
+ else if( value.equals( BOOTSTRAP ) )
+ {
+ return value;
+ }
else
{
Version decimal = getDecimalVersion();
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-08-02 15:49:14 UTC (rev 1703)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -73,7 +73,7 @@
{
enclosing =
new ModuleDirective(
- elem, null, Classifier.EXTERNAL, ".", null,
+ elem, null, Classifier.EXTERNAL, null, null,
new DataDirective[0], new DependencyDirective[0],
new ResourceDirective[]{enclosing}, null, null );
}
@@ -95,10 +95,10 @@
* @param name the module name
* @param resource resource contained within the module
*/
- public ModuleDirective( String name, ResourceDirective resource )
+ public ModuleDirective( String name, String version, ResourceDirective
resource )
{
this(
- name, null, Classifier.ANONYMOUS, null, null,
+ name, version, Classifier.ANONYMOUS, null, null,
new DataDirective[0], new DependencyDirective[0],
new ResourceDirective[]{resource}, null, null );
}
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-08-02 15:49:14 UTC (rev 1703)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -116,7 +116,7 @@
{
resource =
new ModuleDirective(
- elem, null, Classifier.EXTERNAL, ".", null,
+ elem, null, Classifier.EXTERNAL, null, null,
new DataDirective[0], new DependencyDirective[0],
new ResourceDirective[]{resource}, null, null );
}
Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/depot/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -4,7 +4,11 @@
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">
+ <properties>
+ <property name="project.micro.version" value="1"/>
+ </properties>
+
+ <project name="dpml-library" basedir="library">
<info title="DPML Project Management Library">
<description>Module, project and resource management
system.</description>
</info>
@@ -19,7 +23,7 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- </resource>
+ </project>
<project name="dpml-library-build" basedir="build">
<info title="DPML Depot Build Tool">
@@ -40,10 +44,10 @@
</test>
</dependencies>
<filters>
- <feature token="ANT-BUILDER-URI" ref="dpml/depot/dpml-tools-builder"
id="uri" type="part"/>
+ <feature token="ANT-BUILDER-URI" ref="dpml/depot/dpml-tools-builder"
id="uri" type="part" alias="true"/>
</filters>
</project>
-
+
<project name="dpml-depot-console" basedir="core">
<info title="DPML Console">
<description>Internal subsystem application handler.</description>
@@ -80,7 +84,7 @@
</filters>
</project>
- <resource name="dpml-tools-builder" basedir="tools">
+ <project name="dpml-tools-builder" basedir="tools">
<info title="DPML Depot Toolkit">
<description>Antlib supporting Depot-based build
automation.</description>
</info>
@@ -98,7 +102,7 @@
<include ref="ant/ant-trax" tag="system"/>
</runtime>
</dependencies>
- </resource>
+ </project>
<project name="dpml-depot-checkstyle" basedir="plugins/checkstyle">
<info title="DPML Checkstyle Plugin">
@@ -128,6 +132,9 @@
<info title="DPML Java to HTML Converter">
<description>Checkstyle plugin for Depot.</description>
</info>
+ <properties>
+ <property name="project.micro.version" value="0"/>
+ </properties>
<types>
<type id="jar"/>
<part:resource alias="true" urn="dpml:convert"
path="net/dpml/tools/convert/antlib.xml"/>
Copied: trunk/main/depot/tools/bootstrap.properties (from rev 1702,
trunk/main/depot/tools/build.properties)
Copied: trunk/main/depot/tools/bootstrap.xml (from rev 1702,
trunk/main/depot/tools/build.xml)
===================================================================
--- trunk/main/depot/tools/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/depot/tools/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-tools-builder" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit">
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property file="../../bootstrap.properties"/>
+ <transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
+
+ <target name="init" depends="bootstrap.init">
+ <filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter token="PROJECT-URI"
value="artifact:part:${project.group}/${project.name}#${project.version}" />
+ <filter token="PROJECT-LINK-URI"
value="link:part:${project.group}/${project.name}" />
+ <filter token="PROJECT-NAME" value="${project.name}" />
+ <filter token="PROJECT-GROUP" value="${project.group}"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ <filter token="ANT-VERSION" value="${tools.ant.version}"/>
+ <filter token="JUNIT-VERSION" value="${junit.version}"/>
+ <filter token="PLUGIN-CLASS"
value="net.dpml.tools.impl.StandardBuilder"/>
+ <filter token="DEPOT-CHECKSTYLE-PLUGIN-URI"
+
value="artifact:part:${project.group}/dpml-depot-checkstyle#SNAPSHOT"/>
+ <filter token="DEPOT-CHECKSTYLE-PLUGIN-LINK-URI"
+ value="link:part:${project.group}/dpml-depot-checkstyle"/>
+ <filter token="TRANSIT-CORE-VERSION" value="SNAPSHOT"/>
+ <filter token="TRANSIT-TOOLS-VERSION" value="SNAPSHOT"/>
+ <filter token="LIBRARY-VERSION" value="SNAPSHOT"/>
+ </target>
+
+ <target name="setup-path" depends="bootstrap.setup-path">
+ <transit:get property="junit.path" uri="${junit.uri}"/>
+ <transit:get property="library.path"
+ uri="artifact:jar:dpml/depot/dpml-library#SNAPSHOT"/>
+ <transit:get property="transit.path"
+ uri="artifact:jar:dpml/transit/dpml-transit-main#SNAPSHOT"/>
+ <path id="project.main.path">
+ <pathelement
+
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-SNAPSHOT.jar"/>
+ <pathelement location="${library.path}"/>
+ <pathelement location="${target.classes.dir}"/>
+ </path>
+ <path id="project.test.path">
+ <pathelement location="${junit.path}"/>
+ <pathelement location="${library.path}"/>
+ <pathelement location="${transit.path}"/>
+ <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
+ </path>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <move file="${target.deliverables.dir}/parts/builder.xml"
+
toFile="${target.deliverables.dir}/parts/${project.name}-${project.version}.part"/>
+ <move file="${target.deliverables.dir}/parts/builder.link"
+ toFile="${target.deliverables.dir}/parts/${project.name}.part.link"/>
+ </target>
+
+ <target name="install" depends="bootstrap.install">
+ <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
+ <mkdir dir="${tools.prefs}"/>
+ <copy toDir="${tools.prefs}">
+ <fileset dir="${target.dir}/prefs">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+
Deleted: trunk/main/depot/tools/build.properties
===================================================================
--- trunk/main/depot/tools/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/depot/tools/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,7 +0,0 @@
-
-project.group = dpml/depot
-project.name = dpml-tools-builder
-tools.ant.version = 1.6.5
-junit.version = 3.8.1
-junit.filename = junit-${junit.version}.jar
-junit.uri = artifact:jar:junit/junit#${junit.version}
Deleted: trunk/main/depot/tools/build.xml
===================================================================
--- trunk/main/depot/tools/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/depot/tools/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="dpml-tools-builder" default="install" basedir="."
- xmlns:transit="antlib:net.dpml.transit">
-
- <property file="${basedir}/build.properties"/>
- <property file="../../bootstrap.properties"/>
- <transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
-
- <target name="init" depends="bootstrap.init">
- <filter token="PART-XSD-URI"
value="link:xsd:dpml/lang/dpml-part#${dpml.xsd.version}"/>
- <filter token="PROJECT-URI"
value="artifact:part:${project.group}/${project.name}#${project.version}" />
- <filter token="PROJECT-LINK-URI"
value="link:part:${project.group}/${project.name}" />
- <filter token="PROJECT-NAME" value="${project.name}" />
- <filter token="PROJECT-GROUP" value="${project.group}"/>
- <filter token="PROJECT-VERSION" value="${project.version}"/>
- <filter token="ANT-VERSION" value="${tools.ant.version}"/>
- <filter token="JUNIT-VERSION" value="${junit.version}"/>
- <filter token="PLUGIN-CLASS"
value="net.dpml.tools.impl.StandardBuilder"/>
- <filter token="DEPOT-CHECKSTYLE-PLUGIN-URI"
-
value="artifact:part:${project.group}/dpml-depot-checkstyle#${project.version}"/>
- <filter token="DEPOT-CHECKSTYLE-PLUGIN-LINK-URI"
- value="link:part:${project.group}/dpml-depot-checkstyle"/>
- </target>
-
- <target name="setup-path" depends="bootstrap.setup-path">
- <transit:get property="junit.path" uri="${junit.uri}"/>
- <transit:get property="library.path"
- uri="artifact:jar:dpml/depot/dpml-library#${project.version}"/>
- <transit:get property="transit.path"
- uri="artifact:jar:dpml/transit/dpml-transit-main#${project.version}"/>
- <path id="project.main.path">
- <pathelement
-
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-${dpml.transit.version}.jar"/>
- <pathelement location="${library.path}"/>
- <pathelement location="${target.classes.dir}"/>
- </path>
- <path id="project.test.path">
- <pathelement location="${junit.path}"/>
- <pathelement location="${library.path}"/>
- <pathelement location="${transit.path}"/>
- <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
- </path>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <move file="${target.deliverables.dir}/parts/builder.xml"
-
toFile="${target.deliverables.dir}/parts/${project.name}-${project.version}.part"/>
- <move file="${target.deliverables.dir}/parts/builder.link"
- toFile="${target.deliverables.dir}/parts/${project.name}.part.link"/>
- </target>
-
- <target name="install" depends="bootstrap.install">
- <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
- <mkdir dir="${tools.prefs}"/>
- <copy toDir="${tools.prefs}">
- <fileset dir="${target.dir}/prefs">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
-</project>
-
Modified: trunk/main/depot/tools/etc/deliverables/parts/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/deliverables/parts/builder.xml 2006-08-02
17:07:53 UTC (rev 1704)
@@ -19,9 +19,9 @@
<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:dpml/transit/dpml-transit-main#@TRANSIT-CORE-VERSION@</uri>
+
<uri>artifact:jar:dpml/transit/dpml-transit-tools#@TRANSIT-TOOLS-VERSION@</uri>
+ <uri>artifact:jar:dpml/depot/dpml-library#@LIBRARY-VERSION@</uri>
<uri>artifact:jar:@PROJECT-GROUP@/@PROJECT-NAME@#@PROJECT-VERSION@</uri>
</private>
</classpath>
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 15:49:14 UTC (rev 1703)
+++ trunk/main/depot/tools/src/main/net/dpml/tools/tasks/InstallTask.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -23,7 +23,9 @@
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.io.IOException;
import java.net.URI;
+import java.net.URL;
import net.dpml.lang.Version;
@@ -32,12 +34,14 @@
import net.dpml.library.Type;
import net.dpml.transit.Artifact;
+import net.dpml.transit.artifact.ArtifactNotFoundException;
import net.dpml.transit.link.ArtifactLinkManager;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.taskdefs.Checksum;
/**
* Execute the install phase.
@@ -59,6 +63,8 @@
private void installDeliverables()
{
Resource resource = getResource();
+ String resourceVersion = resource.getVersion();
+ boolean snapshot = "SNAPSHOT".equals( resourceVersion );
Type[] types = resource.getTypes();
if( types.length == 0 )
{
@@ -89,7 +95,32 @@
+ "] however no artifacts of that type are present in the
target deliverables directory.";
throw new BuildException( error, getLocation() );
}
-
+
+ if( !snapshot )
+ {
+ try
+ {
+ Artifact artifact = resource.getArtifact( id );
+ URL url = artifact.toURL();
+ File file = (File) url.getContent( new
Class[]{File.class} );
+ if( file.exists() )
+ {
+ compare( file, target );
+ }
+ }
+ catch( ArtifactNotFoundException anfe )
+ {
+ // continue as there is nothing to compare with
+ }
+ catch( IOException ioe )
+ {
+ final String error =
+ "IO error while attempting to cross-check resource
type: " + id
+ + "\n" + ioe.toString();
+ throw new BuildException( error, ioe, getLocation() );
+ }
+ }
+
//
// If the type declares an alias then construct a link
// and add the link to the deliverables directory as part of
@@ -189,6 +220,32 @@
}
}
+ private void compare( File old, File target )
+ {
+ String oldValue = getChecksum( old );
+ String newValue = getChecksum( target );
+ if( !oldValue.equals( newValue ) )
+ {
+ final String error =
+ "Produced resource has the same id as an existing resource but
MD5s are not equal."
+ + "\n Existing: " + oldValue
+ + "\n New: " + newValue;
+ throw new BuildException( error, getLocation() );
+ }
+ System.out.println( "# CHECKSUM OK" );
+ }
+
+ private String getChecksum( File file )
+ {
+ final Checksum checksum = (Checksum) getProject().createTask(
"checksum" );
+ checksum.setTaskName( getTaskName() );
+ checksum.setFile( file );
+ checksum.setProperty( "checksum.property" );
+ checksum.init();
+ checksum.execute();
+ return getProject().getProperty( "checksum.property" );
+ }
+
/**
* Utility operation to copy a fileset to a destination directory.
* @param destination the destination directory
Copied: trunk/main/lang/component/bootstrap.properties (from rev 1702,
trunk/main/lang/component/build.properties)
Copied: trunk/main/lang/component/bootstrap.xml (from rev 1702,
trunk/main/lang/component/build.xml)
===================================================================
--- trunk/main/lang/component/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/lang/component/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004-2005 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ 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.
+-->
+
+<project name="dpml-component" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/lang"/>
+ <property name="project.name" value="dpml-component"/>
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property name="home" value="../.."/>
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <filter token="PART-XSD-LINK-URI"
value="link:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter token="TYPE-XSD-URI" value="link:xsd:dpml/lang/dpml-type#1.0"/>
+ <filter token="PROJECT-XSD-LINK-URI"
+
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.dir}/component.xsd"/>
+ <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
+ </target>
+
+</project>
Deleted: trunk/main/lang/component/build.properties
===================================================================
--- trunk/main/lang/component/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/lang/component/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,2 +0,0 @@
-
-specification.version = 1.0
Deleted: trunk/main/lang/component/build.xml
===================================================================
--- trunk/main/lang/component/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/lang/component/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- 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.
--->
-
-<project name="dpml-component" default="install" basedir=".">
-
- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-component"/>
-
- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
- <import file="${home}/bootstrap.xml"/>
-
- <target name="init" depends="bootstrap.init">
- <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <filter token="PART-XSD-LINK-URI"
value="link:xsd:dpml/lang/dpml-part#1.0"/>
- <filter token="TYPE-XSD-URI" value="link:xsd:dpml/lang/dpml-type#1.0"/>
- <filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#1.0"/>
- <filter token="PROJECT-XSD-URI" value="${xsd.uri}"/>
- <filter token="PROJECT-XSD-LINK-URI"
-
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${xsds.dir}"/>
- <property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/component.xsd"/>
- <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
- <echo
file="${xsds.dir}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
- </target>
-
-</project>
Copied: trunk/main/lang/module/bootstrap.properties (from rev 1702,
trunk/main/lang/module/build.properties)
===================================================================
--- trunk/main/lang/module/build.properties 2006-08-02 08:29:16 UTC (rev
1702)
+++ trunk/main/lang/module/bootstrap.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,3 @@
+
+build.version = 1.0.0
+specification.version = 1.0
Copied: trunk/main/lang/module/bootstrap.xml (from rev 1702,
trunk/main/lang/module/build.xml)
===================================================================
--- trunk/main/lang/module/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/lang/module/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2005-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.
+-->
+
+<project name="dpml-module" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/lang"/>
+ <property name="project.name" value="dpml-module"/>
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property name="home" value="../.."/>
+
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="PROJECT-XSD-SPEC-URI" value="${xsd.spec.uri}"/>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <property name="xsds" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.dir}/module.xsd"/>
+ <checksum fileext=".md5" file="${xsds}/${filename}"/>
+ </target>
+
+</project>
Deleted: trunk/main/lang/module/build.properties
===================================================================
--- trunk/main/lang/module/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/lang/module/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,2 +0,0 @@
-
-specification.version = 1.0
Deleted: trunk/main/lang/module/build.xml
===================================================================
--- trunk/main/lang/module/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/lang/module/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2005-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.
--->
-
-<project name="dpml-module" default="install" basedir=".">
-
- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-module"/>
-
- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
-
- <import file="${home}/bootstrap.xml"/>
-
- <target name="init" depends="bootstrap.init">
- <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#${project.version}"/>
- <filter token="PROJECT-XSD-URI" value="${xsd.uri}"/>
- <filter token="PROJECT-XSD-SPEC-URI" value="${xsd.spec.uri}"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="xsds" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${xsds}"/>
- <property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/module.xsd"/>
- <checksum fileext=".md5" file="${xsds}/${filename}"/>
- <echo file="${xsds}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
- </target>
-
-</project>
Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/lang/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,16 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module name="lang" xmlns="link:xsd:dpml/lang/dpml-module#1.0">
- <resource name="dpml-module">
+ <properties>
+ <property name="project.micro.version" value="0"/>
+ </properties>
+
+ <project name="dpml-module" basedir="module">
<info title="DPML Library XSD Schema">
<description>Formal XML specification of the index, module, project
and resource elements.</description>
</info>
<types>
<type id="xsd" version="1.0"/>
</types>
- </resource>
+ <filters>
+ <feature token="PROJECT-XSD-URI" id="uri" type="xsd"/>
+ <feature token="PROJECT-XSD-SPEC-URI" id="uri" type="xsd"
alias="true"/>
+ </filters>
+ </project>
- <resource name="dpml-part">
+ <project name="dpml-part" basedir="part">
<info title="DPML Part XSD Schema">
<description>Formal XML specification of a part deployment
unit.</description>
</info>
@@ -22,18 +30,25 @@
<include key="dpml-module"/>
</build>
</dependencies>
- </resource>
+ <filters>
+ <feature token="MODULE-XSD-SPEC-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-module" alias="true"/>
+ <feature token="PROJECT-XSD-SPEC-URI" id="uri" type="xsd"
alias="true"/>
+ </filters>
+ </project>
- <resource name="dpml-state">
+ <project name="dpml-state" basedir="state">
<info title="DPML State XSD Schema">
<description>Formal XML specification of a state transition
model.</description>
</info>
<types>
<type id="xsd" version="1.0"/>
</types>
- </resource>
+ <filters>
+ <feature token="PROJECT-XSD-URI" id="uri" type="xsd" alias="true"/>
+ </filters>
+ </project>
- <resource name="dpml-component">
+ <project name="dpml-component" basedir="component">
<info title="DPML State XSD Schema">
<description>Formal XML specification of the Metro component
descriptors and deployment directives.</description>
</info>
@@ -46,9 +61,15 @@
<include key="dpml-type"/>
</build>
</dependencies>
- </resource>
+ <filters>
+ <feature token="PROJECT-XSD-LINK-URI" id="uri" type="xsd"
alias="true"/>
+ <feature token="PART-XSD-LINK-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part" alias="true"/>
+ <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type" alias="true"/>
+ <feature token="MODULE-XSD-SPEC-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-module" alias="true"/>
+ </filters>
+ </project>
- <resource name="dpml-type">
+ <project name="dpml-type" basedir="type">
<info title="DPML Type XSD Schema">
<description>Formal XML specification of the Metro component type
descriptors.</description>
</info>
@@ -61,6 +82,11 @@
<include key="dpml-part"/>
</build>
</dependencies>
- </resource>
+ <filters>
+ <feature token="PROJECT-XSD-URI" id="uri" type="xsd" alias="true"/>
+ <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part" alias="true"/>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state" alias="true"/>
+ </filters>
+ </project>
</module>
Copied: trunk/main/lang/part/bootstrap.properties (from rev 1702,
trunk/main/lang/part/build.properties)
Copied: trunk/main/lang/part/bootstrap.xml (from rev 1702,
trunk/main/lang/part/build.xml)
===================================================================
--- trunk/main/lang/part/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/lang/part/bootstrap.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004-2005 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ 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.
+-->
+
+<project name="dpml-part" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/lang"/>
+ <property name="project.name" value="dpml-part"/>
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property name="home" value="../.."/>
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="MODULE-XSD-SPEC-URI"
value="link:xsd:dpml/lang/dpml-module#${specification.version}"/>
+ <filter token="PROJECT-XSD-SPEC-URI" value="${xsd.spec.uri}"/>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <property name="xsds" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.dir}/part.xsd"/>
+ <checksum fileext=".md5" file="${xsds}/${filename}"/>
+ </target>
+
+</project>
Deleted: trunk/main/lang/part/build.properties
===================================================================
--- trunk/main/lang/part/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/lang/part/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,2 +0,0 @@
-
-specification.version = 1.0
Deleted: trunk/main/lang/part/build.xml
===================================================================
--- trunk/main/lang/part/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/lang/part/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- 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.
--->
-
-<project name="dpml-part" default="install" basedir=".">
-
- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-part"/>
-
- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
- <import file="${home}/bootstrap.xml"/>
-
- <target name="init" depends="bootstrap.init">
- <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
- <filter token="MODULE-XSD-SPEC-URI"
value="link:xsd:dpml/lang/dpml-module#${specification.version}"/>
- <filter token="PROJECT-XSD-SPEC-URI" value="${xsd.spec.uri}"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="xsds" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${xsds}"/>
- <property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/part.xsd"/>
- <checksum fileext=".md5" file="${xsds}/${filename}"/>
- <echo file="${xsds}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
- </target>
-
-</project>
Copied: trunk/main/lang/state/bootstrap.properties (from rev 1702,
trunk/main/lang/state/build.properties)
Copied: trunk/main/lang/state/bootstrap.xml (from rev 1702,
trunk/main/lang/state/build.xml)
===================================================================
--- trunk/main/lang/state/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/lang/state/bootstrap.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004-2005 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ 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.
+-->
+
+<project name="dpml-state" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/lang"/>
+ <property name="project.name" value="dpml-state"/>
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property name="home" value="../.."/>
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="PROJECT-XSD-URI" value="${xsd.spec.uri}"/>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.dir}/state.xsd"/>
+ <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
+ </target>
+
+</project>
Deleted: trunk/main/lang/state/build.properties
===================================================================
--- trunk/main/lang/state/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/lang/state/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,2 +0,0 @@
-
-specification.version = 1.0
Deleted: trunk/main/lang/state/build.xml
===================================================================
--- trunk/main/lang/state/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/lang/state/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- 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.
--->
-
-<project name="dpml-state" default="install" basedir=".">
-
- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-state"/>
-
- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
- <import file="${home}/bootstrap.xml"/>
-
- <target name="init" depends="bootstrap.init">
- <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
- <filter token="PROJECT-XSD-URI" value="${xsd.spec.uri}"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${xsds.dir}"/>
- <property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/state.xsd"/>
- <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
- <echo
file="${xsds.dir}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
- </target>
-
-</project>
Copied: trunk/main/lang/type/bootstrap.properties (from rev 1702,
trunk/main/lang/type/build.properties)
Copied: trunk/main/lang/type/bootstrap.xml (from rev 1702,
trunk/main/lang/type/build.xml)
===================================================================
--- trunk/main/lang/type/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/lang/type/bootstrap.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004-2005 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ 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.
+-->
+
+<project name="dpml-type" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/lang"/>
+ <property name="project.name" value="dpml-type"/>
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property name="home" value="../.."/>
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="xsd.link.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="PROJECT-XSD-URI" value="${xsd.link.uri}"/>
+ <filter token="STATE-XSD-URI" value="link:xsd:dpml/lang/dpml-state#1.0"/>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds.dir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.dir}/type.xsd"/>
+ <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
+ </target>
+
+</project>
Deleted: trunk/main/lang/type/build.properties
===================================================================
--- trunk/main/lang/type/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/lang/type/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,2 +0,0 @@
-
-specification.version = 1.0
Deleted: trunk/main/lang/type/build.xml
===================================================================
--- trunk/main/lang/type/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/lang/type/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- 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.
--->
-
-<project name="dpml-type" default="install" basedir=".">
-
- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-type"/>
-
- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
- <import file="${home}/bootstrap.xml"/>
-
- <target name="init" depends="bootstrap.init">
- <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <property name="xsd.link.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
- <filter token="PROJECT-XSD-URI" value="${xsd.link.uri}"/>
- <filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
- <filter token="STATE-XSD-URI" value="link:xsd:dpml/lang/dpml-state#1.0"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${xsds.dir}"/>
- <property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/type.xsd"/>
- <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
- <echo
file="${xsds.dir}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
- </target>
-
-</project>
Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/metro/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -3,6 +3,10 @@
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">
+
+ <properties>
+ <property name="project.micro.version" value="1"/>
+ </properties>
<project name="dpml-metro-state" basedir="state">
<info title="DPML State Management Model">
Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/planet/http/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -2,12 +2,12 @@
<module name="http" basedir="." xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<properties>
- <property name="jetty.version" value="6.0.0-R534"/>
+ <property name="jetty.version" value="6.0.0-RC0"/>
<property name="jasper.version" value="5.5.15"/>
<property name="sl4j.version" value="1.0.1"/>
<property name="project.major.version" value="0"/>
<property name="project.minor.version" value="0"/>
- <property name="project.micro.version" value="0"/>
+ <property name="project.micro.version" value="1"/>
</properties>
<project name="dpml-http-impl" basedir="impl">
Modified: trunk/main/planet/module.xml
===================================================================
--- trunk/main/planet/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/planet/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -2,6 +2,12 @@
<module name="planet"
xmlns="link:xsd:dpml/lang/dpml-module#1.0">
+ <properties>
+ <property name="project.major.version" value="0"/>
+ <property name="project.minor.version" value="0"/>
+ <property name="project.micro.version" value="1"/>
+ </properties>
+
<module file="http/module.xml"/>
</module>
Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/station/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -3,11 +3,18 @@
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">
+
+ <properties>
+ <property name="project.micro.version" value="1"/>
+ </properties>
<project name="dpml-station-info" basedir="info">
<info title="DPML Station XSD Schema">
<description>Formal specification of application registry
elements.</description>
</info>
+ <properties>
+ <property name="project.micro.version" value="0"/>
+ </properties>
<types>
<type id="xsd" version="1.0"/>
</types>
Copied: trunk/main/transit/core/bootstrap.properties (from rev 1702,
trunk/main/transit/core/build.properties)
Copied: trunk/main/transit/core/bootstrap.xml (from rev 1702,
trunk/main/transit/core/build.xml)
===================================================================
--- trunk/main/transit/core/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/transit/core/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004-2005 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ 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.
+-->
+
+<project name="dpml-transit-main" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/transit"/>
+ <property name="project.name" value="dpml-transit-main"/>
+
+ <property file="${basedir}/bootstrap.properties"/>
+ <property file="${home}/bootstrap.properties"/>
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="setup-path" depends="init">
+ <path id="project.test.path">
+ <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
+ <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
+ <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
+ <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ </path>
+ </target>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="part.xsd.version"
value="${project.specification.version}"/>
+ <filter token="PART-XSD-SPEC-URI"
value="link:xsd:dpml/lang/dpml-part#${part.xsd.version}"/>
+ <filter token="PROJECT-NAME" value="${project.name}"/>
+ <filter token="PROJECT-GROUP" value="${project.group}"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ </target>
+
+ <target name="build" depends="bootstrap.build">
+ <rmic base="${target.classes.dir}">
+ <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="build">
+ <mkdir dir="${target.deliverables.jars.dir}"/>
+ <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
+ basedir="${target.classes.dir}"
+ includes="**/*.*" excludes="**/*.html,**/*.png"
+ index="true">
+ </jar>
+ <checksum fileext=".md5"
file="${target.deliverables.jars.dir}/${project.filename}"/>
+ <delete file="${target.deliverables.jars.dir}/${project.filename}.asc"/>
+ <antcall target="execute.jar.asc"/>
+ <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>
+
+ <target name="install" depends="bootstrap.install">
+ <property name="lib" location="${dpml.system}/lib"/>
+ <property name="short.filename" value="${project.name}.jar"/>
+ <property name="long.filename"
value="${project.name}-${project.version}.jar"/>
+ <mkdir dir="${lib}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML Lib ${lib}
+#----------------------------------------------------------------------------------
+ </echo>
+ <delete verbose="true" failonerror="false">
+ <fileset dir="${lib}">
+ <include name="${project.name}-*.*"/>
+ <exclude name="${short.filename}"/>
+ </fileset>
+ </delete>
+ <copy toFile="${lib}/${short.filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.deliverables.jars.dir}/${long.filename}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating Ant. ${user.home}/.ant/lib
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy preservelastmodified="true" overwrite="true"
+ tofile="${user.home}/.ant/lib/${short.filename}"
+ file="${target.deliverables.jars.dir}/${long.filename}"/>
+ </target>
+
+</project>
Deleted: trunk/main/transit/core/build.properties
===================================================================
--- trunk/main/transit/core/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/transit/core/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,8 +0,0 @@
-
-home = ../..
-project.test.fork = true
-project.jar.main.class=net.dpml.transit.Main
-project.specification.version = 1.0
-project.schema.version = 1.0
-
-
Deleted: trunk/main/transit/core/build.xml
===================================================================
--- trunk/main/transit/core/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/transit/core/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- 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.
--->
-
-<project name="dpml-transit-main" default="install" basedir=".">
-
- <property name="project.group" value="dpml/transit"/>
- <property name="project.name" value="dpml-transit-main"/>
-
- <property file="${basedir}/build.properties"/>
- <property file="${home}/bootstrap.properties"/>
- <import file="${home}/bootstrap.xml"/>
-
- <target name="setup-path" depends="init">
- <path id="project.test.path">
- <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
- <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
- <pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
- </path>
- </target>
-
- <target name="init" depends="bootstrap.init">
- <property name="part.xsd.version"
value="${project.specification.version}"/>
- <filter token="PART-XSD-SPEC-URI"
value="link:xsd:dpml/lang/dpml-part#${part.xsd.version}"/>
- <filter token="PROJECT-NAME" value="${project.name}"/>
- <filter token="PROJECT-GROUP" value="${project.group}"/>
- <filter token="PROJECT-VERSION" value="${project.version}"/>
- </target>
-
- <target name="build" depends="bootstrap.build">
- <rmic base="${target.classes.dir}">
- <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="build">
- <mkdir dir="${target.deliverables.jars.dir}"/>
- <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
- basedir="${target.classes.dir}"
- includes="**/*.*" excludes="**/*.html,**/*.png"
- index="true">
- </jar>
- <checksum fileext=".md5"
file="${target.deliverables.jars.dir}/${project.filename}"/>
- <delete file="${target.deliverables.jars.dir}/${project.filename}.asc"/>
- <antcall target="execute.jar.asc"/>
- <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>
-
- <target name="install" depends="bootstrap.install">
- <property name="lib" location="${dpml.system}/lib"/>
- <property name="short.filename" value="${project.name}.jar"/>
- <property name="long.filename"
value="${project.name}-${project.version}.jar"/>
- <mkdir dir="${lib}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML Lib ${lib}
-#----------------------------------------------------------------------------------
- </echo>
- <delete verbose="true" failonerror="false">
- <fileset dir="${lib}">
- <include name="${project.name}-*.*"/>
- <exclude name="${short.filename}"/>
- </fileset>
- </delete>
- <copy toFile="${lib}/${short.filename}" preservelastmodified="true"
overwrite="true"
- file="${target.deliverables.jars.dir}/${long.filename}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating Ant. ${user.home}/.ant/lib
-#----------------------------------------------------------------------------------
- </echo>
- <copy preservelastmodified="true" overwrite="true"
- tofile="${user.home}/.ant/lib/${short.filename}"
- file="${target.deliverables.jars.dir}/${long.filename}"/>
- </target>
-
-</project>
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-08-02 15:49:14 UTC (rev 1703)
+++
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-08-02 17:07:53 UTC (rev 1704)
@@ -191,6 +191,21 @@
public Object getContent( Class[] classes )
throws IOException
{
+
+ //
+ // attempt to resolve this locally as we may be dealing
+ // with Depot references to the artifact File
+ //
+
+ for( int i=0; i < classes.length; i++ )
+ {
+ Class c = classes[i];
+ if( c.equals( File.class ) )
+ {
+ return m_context.getCacheHandler().getLocalFile( m_artifact
);
+ }
+ }
+
String type = m_artifact.getType();
//
@@ -221,19 +236,6 @@
boolean ignoreThis = true;
}
- //
- // attempt to resolve this locally as we may be dealing
- // with Magic references to the artifact File
- //
-
- for( int i=0; i < classes.length; i++ )
- {
- Class c = classes[i];
- if( c.equals( File.class ) )
- {
- return m_context.getCacheHandler().getLocalFile( m_artifact
);
- }
- }
return null;
}
Modified: trunk/main/transit/module.xml
===================================================================
--- trunk/main/transit/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/transit/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -6,6 +6,9 @@
<properties>
<property name="project.test.fork" value="true"/>
+ <property name="project.major.version" value="1"/>
+ <property name="project.minor.version" value="0"/>
+ <property name="project.micro.version" value="1"/>
</properties>
<project name="dpml-transit-console" basedir="console">
@@ -28,16 +31,16 @@
</dependencies>
</project>
- <resource name="dpml-transit-main" basedir="core">
+ <project name="dpml-transit-main" basedir="core">
<info title="DPML Transit Resource Management">
<description>Transit resource management system.</description>
</info>
<types>
<type id="jar"/>
</types>
- </resource>
+ </project>
- <resource name="dpml-transit-tools" basedir="tools">
+ <project name="dpml-transit-tools" basedir="tools">
<info title="DPML Transit Antlib">
<description>Transit tools for the Ant build system.</description>
</info>
@@ -50,6 +53,6 @@
<include ref="ant/ant"/>
</runtime>
</dependencies>
- </resource>
+ </project>
</module>
Copied: trunk/main/transit/tools/bootstrap.properties (from rev 1702,
trunk/main/transit/tools/build.properties)
Copied: trunk/main/transit/tools/bootstrap.xml (from rev 1702,
trunk/main/transit/tools/build.xml)
===================================================================
--- trunk/main/transit/tools/build.xml 2006-08-02 08:29:16 UTC (rev 1702)
+++ trunk/main/transit/tools/bootstrap.xml 2006-08-02 17:07:53 UTC (rev
1704)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004-2005 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ 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.
+-->
+
+<project name="dpml-transit-tools" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/transit"/>
+ <property name="project.name" value="dpml-transit-tools"/>
+ <property name="project.antlib" value="${project.name}.jar"/>
+ <property file="${basedir}/bootstrap.properties"/>
+
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <property name="dpml-transit-handler.filename"
value="dpml-transit-main-${project.version}.jar"/>
+ </target>
+
+ <target name="setup-path" depends="init">
+ <path id="project.main.path">
+ <pathelement
location="${dpml.local.cache}/${project.group}/jars/${dpml-transit-handler.filename}"/>
+ <pathelement location="${target.classes.dir}"/>
+ <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
+ <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
+ <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ </path>
+ </target>
+
+ <target name="install" depends="bootstrap.install">
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating Ant. ${user.home}/.ant/lib
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy tofile="${user.home}/.ant/lib/dpml-transit-tools.jar"
+
file="${target.deliverables.jars.dir}/${project.name}-${project.version}.jar"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating Prefs. ${dpml.prefs}
+#----------------------------------------------------------------------------------
+ </echo>
+ <property name="templates" value="${dpml.prefs}/dpml/transit/templates"/>
+ <echo>Adding build template to ${templates}</echo>
+ <mkdir dir="${templates}"/>
+ <copy file="${home}/bootstrap.xml"
tofile="${templates}/bootstrap.template" />
+ </target>
+
+</project>
Deleted: trunk/main/transit/tools/build.properties
===================================================================
--- trunk/main/transit/tools/build.properties 2006-08-02 15:49:14 UTC (rev
1703)
+++ trunk/main/transit/tools/build.properties 2006-08-02 17:07:53 UTC (rev
1704)
@@ -1,4 +0,0 @@
-
-home = ../..
-project.specification.version = 1.0
-
Deleted: trunk/main/transit/tools/build.xml
===================================================================
--- trunk/main/transit/tools/build.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/transit/tools/build.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2004-2005 Stephen J McConnell
- Copyright 2004 Niclas Hedhman
-
- 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.
--->
-
-<project name="dpml-transit-tools" default="install" basedir=".">
-
- <property name="project.group" value="dpml/transit"/>
- <property name="project.name" value="dpml-transit-tools"/>
- <property name="project.antlib" value="${project.name}.jar"/>
- <property file="${basedir}/build.properties"/>
-
- <import file="${home}/bootstrap.xml"/>
-
- <target name="setup-path" depends="init">
- <path id="project.main.path">
- <pathelement
location="${dpml.local.cache}/${project.group}/jars/${dpml-transit-handler.filename}"/>
- <pathelement location="${target.classes.dir}"/>
- <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
- <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
- </path>
- </target>
-
- <target name="install" depends="bootstrap.install">
- <echo>
-#----------------------------------------------------------------------------------
-# Updating Ant. ${user.home}/.ant/lib
-#----------------------------------------------------------------------------------
- </echo>
- <copy tofile="${user.home}/.ant/lib/dpml-transit-tools.jar"
-
file="${target.deliverables.jars.dir}/${project.name}-${project.version}.jar"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating Prefs. ${dpml.prefs}
-#----------------------------------------------------------------------------------
- </echo>
- <property name="templates" value="${dpml.prefs}/dpml/transit/templates"/>
- <echo>Adding build template to ${templates}</echo>
- <mkdir dir="${templates}"/>
- <copy file="${home}/bootstrap.xml"
tofile="${templates}/bootstrap.template" />
- </target>
-
-</project>
Modified: trunk/main/util/module.xml
===================================================================
--- trunk/main/util/module.xml 2006-08-02 15:49:14 UTC (rev 1703)
+++ trunk/main/util/module.xml 2006-08-02 17:07:53 UTC (rev 1704)
@@ -2,6 +2,12 @@
<module name="util" basedir="."
xmlns="link:xsd:dpml/lang/dpml-module#1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
+
+ <properties>
+ <property name="project.major.version" value="1"/>
+ <property name="project.minor.version" value="0"/>
+ <property name="project.micro.version" value="0"/>
+ </properties>
<dependencies>
<build>
- r1704 - in trunk: . main main/depot main/depot/build/src/main/net/dpml/library/console main/depot/library main/depot/library/src/main/net/dpml/library/impl main/depot/library/src/main/net/dpml/library/info main/depot/tools main/depot/tools/etc/deliverables/parts main/depot/tools/src/main/net/dpml/tools/tasks main/lang main/lang/component main/lang/module main/lang/part main/lang/state main/lang/type main/metro main/planet main/planet/http main/station main/transit main/transit/core main/transit/core/src/main/net/dpml/transit/artifact main/transit/tools main/util, mcconnell at BerliOS, 08/02/2006
Archive powered by MHonArc 2.6.24.