notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1462 - in trunk/main: . depot/tools/builder/src/main/net/dpml/tools/tasks lang station station/info

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1462 - in trunk/main: . depot/tools/builder/src/main/net/dpml/tools/tasks lang station station/info
Date: Sat, 27 May 2006 08:25:40 +0200

Author: mcconnell
Date: 2006-05-27 08:25:23 +0200 (Sat, 27 May 2006)
New Revision: 1462

Added:
trunk/main/station/info/
Removed:
trunk/main/lang/application/
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
trunk/main/lang/module.xml
trunk/main/station/info/build.xml
trunk/main/station/module.xml
Log:
move application xsd to the station module

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-05-27 04:48:33 UTC (rev 1461)
+++ trunk/main/bootstrap 2006-05-27 06:25:23 UTC (rev 1462)
@@ -84,13 +84,6 @@
cd ../..
}

-dpmlApplication()
-{
- cd lang/application
- build clean install
- cd ../..
-}
-
transitMain()
{
cd transit/core
@@ -156,7 +149,6 @@
dpmlState
dpmlComponent
dpmlType
-dpmlApplication
transitMain
transitTools
dpmlLibrary

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-05-27 04:48:33 UTC (rev 1461)
+++ trunk/main/bootstrap.bat 2006-05-27 06:25:23 UTC (rev 1462)
@@ -27,8 +27,6 @@
IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-type
IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-application
-IF ERRORLEVEL 1 GOTO :exit
CALL :transit-main
IF ERRORLEVEL 1 GOTO :exit
CALL :transit-tools
@@ -97,12 +95,6 @@
POPD
GOTO :EOF

-:dpml-application
-PUSHD lang\application
-CALL :build clean install
-POPD
-GOTO :EOF
-
:transit-main
PUSHD transit\core
CALL :build clean install

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
2006-05-27 04:48:33 UTC (rev 1461)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
2006-05-27 06:25:23 UTC (rev 1462)
@@ -187,7 +187,7 @@
copy.setPreserveLastModified( preserve );
copy.setTodir( destination );
copy.addFileset( fileset );
- //copy.setOverwrite( true );
+ copy.setOverwrite( true ); // required for filtered deliverables
copy.init();
copy.execute();
}

Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-05-27 04:48:33 UTC (rev 1461)
+++ trunk/main/lang/module.xml 2006-05-27 06:25:23 UTC (rev 1462)
@@ -62,6 +62,7 @@
</dependencies>
</resource>

+ 
+
</module>

Copied: trunk/main/station/info (from rev 1457, trunk/main/lang/application)

Modified: trunk/main/station/info/build.xml
===================================================================
--- trunk/main/lang/application/build.xml 2006-05-25 06:02:59 UTC (rev
1457)
+++ trunk/main/station/info/build.xml 2006-05-27 06:25:23 UTC (rev 1462)
@@ -17,29 +17,20 @@
limitations under the License.
-->

-<project name="dpml-component" default="install" basedir=".">
+<project name="dpml-station-info"
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="dpml:depot"
+ default="install">

- <property name="project.group" value="dpml/lang"/>
- <property name="project.name" value="dpml-application"/>
+ <transit:import uri="local:template:dpml/tools/standard"/>

- <property file="${basedir}/build.properties"/>
- <property name="home" value="../.."/>
-
- <import file="${home}/bootstrap.xml"/>
-
- <target name="init" depends="bootstrap.init">
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
- <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#1.0"/>
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- </target>
-
- <target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
+ <target name="package" depends="standard.package">
+ <property name="deliverables"
location="${project.target.deliverables.dir}"/>
+ <property name="xsds" location="${deliverables}/xsds"/>
+ <mkdir dir="${xsds}"/>
<property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
- file="${target.dir}/application.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${project.target.dir}/application.xsd"/>
</target>

</project>

Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-05-27 04:48:33 UTC (rev 1461)
+++ trunk/main/station/module.xml 2006-05-27 06:25:23 UTC (rev 1462)
@@ -4,6 +4,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">

+ <project name="dpml-station-info" basedir="info">
+ <types>
+ <type id="xsd" alias="true"/>
+ </types>
+ <dependencies>
+ <build>
+ <include ref="dpml/lang/dpml-part"/>
+ </build>
+ </dependencies>
+ <filters>
+ <feature token="COMMON-XSD-URI" ref="dpml/lang/dpml-common" type="xsd"
id="uri"/>
+ <feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri"/>
+ <feature token="PROJECT-XSD-URI" type="xsd" id="uri"/>
+ </filters>
+ </project>
+
<project name="dpml-station-api" basedir="api">
<types>
<type id="jar"/>
@@ -21,7 +37,7 @@
<feature token="COMMON-XSD-URI" ref="dpml/lang/dpml-common" type="xsd"
id="uri"/>
<feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri"/>
<feature token="COMPONENT-XSD-URI" ref="dpml/lang/dpml-component"
type="xsd" id="uri"/>
- <feature token="APPLICATION-XSD-URI" ref="dpml/lang/dpml-application"
type="xsd" id="uri"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
</filters>
</project>

@@ -61,7 +77,7 @@
</test>
</dependencies>
<filters>
- <feature token="APPLICATION-XSD-URI" ref="dpml/lang/dpml-application"
type="xsd" id="uri"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
</filters>
</project>

@@ -93,7 +109,7 @@
</test>
</dependencies>
<filters>
- <feature token="APPLICATION-XSD-URI" ref="dpml/lang/dpml-application"
type="xsd" id="uri"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
</filters>
</project>

r1462 - in trunk/main: . depot/tools/builder/src/main/net/dpml/tools/tasks lang station station/info, mcconnell at BerliOS, 05/27/2006