Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1525 - in staging: . transit transit/handler transit/plugin

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1525 - in staging: . transit transit/handler transit/plugin
  • Date: Tue, 18 Jan 2005 17:07:36 +0100

Author: mcconnell
Date: Tue Jan 18 17:07:36 2005
New Revision: 1525

Added:
staging/build.xml
staging/index.xml
Modified:
staging/transit/handler/build.properties
staging/transit/handler/build.xml
staging/transit/index.xml
staging/transit/module.xml
staging/transit/plugin/build.xml
Log:
A temp update to staging - build ok but the generated manifest for the
transit module does not include the ut8il module include. This is a techical
issue that needs to be resolved in the build or plugin logic.

Added: staging/build.xml
==============================================================================
--- (empty file)
+++ staging/build.xml Tue Jan 18 17:07:36 2005
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml" default="default" basedir="."
+ xmlns:magic="antlib:net.dpml.magic" >
+
+ <magic:import uri="artifact:template:dpml/magic/reactor"/>
+
+</project>

Added: staging/index.xml
==============================================================================
--- (empty file)
+++ staging/index.xml Tue Jan 18 17:07:36 2005
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004 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.
+-->
+
+
+<index>
+ <import index="util/index.xml"/>
+ <import index="transit/index.xml"/>
+</index>

Modified: staging/transit/handler/build.properties
==============================================================================
--- staging/transit/handler/build.properties (original)
+++ staging/transit/handler/build.properties Tue Jan 18 17:07:36 2005
@@ -1,10 +1,3 @@

-project.group = dpml/transit
-project.name = dpml-transit-main
-
-project.antlib = ${project.name}.jar
-
project.test.fork = true

-junit-filename = junit-3.8.1.jar
-

Modified: staging/transit/handler/build.xml
==============================================================================
--- staging/transit/handler/build.xml (original)
+++ staging/transit/handler/build.xml Tue Jan 18 17:07:36 2005
@@ -18,29 +18,11 @@
limitations under the License.
-->

-<project name="dpml-transit-main" default="install" basedir="." >
+<project name="dpml-transit-main" default="install" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <import file="../../bootstrap.xml"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

- <target name="init" depends="bootstrap.init">
- <echo>
-#----------------------------------------------------------------------------------
-# Transit Protocol Handler
-#----------------------------------------------------------------------------------
- </echo>
- <mkdir dir="${dpml.home}/transit"/>
- </target>
-
- <target name="install" depends="bootstrap.install">
- <echo>Installing to: ${user.home}/.ant/lib</echo>
- <copy toFile="${user.home}/.ant/lib/${project.antlib}"
- file="${basedir}/target/deliverables/jars/${project.filename}"
overwrite="true">
- </copy>
- <filter token="PROJECT-VERSION" value="${project.version}"/>
- <copy toDir="${dpml.home}/transit" overwrite="true" filtering="true">
- <fileset dir="${target.dir}/setup"/>
- </copy>
- </target>

</project>
-

Modified: staging/transit/index.xml
==============================================================================
--- staging/transit/index.xml (original)
+++ staging/transit/index.xml Tue Jan 18 17:07:36 2005
@@ -20,10 +20,7 @@

<index>

- <import index="../magic/index.xml"
- uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT" />
- <import index="../util/index.xml"
- uri="artifact:module:dpml/util/dpml-util#SNAPSHOT" />
+ <import index="../util/index.xml"/>

<!--
Transit Module
@@ -37,9 +34,6 @@
<status>SNAPSHOT</status>
<type>module</type>
</info>
- <plugins>
- <include key="dpml-magic-checkstyle"/>
- </plugins>
<dependencies>
<include key="dpml-util"/>
</dependencies>

Modified: staging/transit/module.xml
==============================================================================
--- staging/transit/module.xml (original)
+++ staging/transit/module.xml Tue Jan 18 17:07:36 2005
@@ -17,7 +17,7 @@
limitations under the License.
-->

-<project name="dpml-transit" default="docs" basedir="."
+<project name="dpml-transit" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

@@ -37,7 +37,7 @@
</x:module>
</target>

- <target name="docs" depends="install,junit-report,checkstyle">
+ <target name="install" depends="standard.install,junit-report,checkstyle">
<x:javadoc overview="overview.html">
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://www.dpml.net/asf/ant/1.6.2/api"/>
@@ -56,7 +56,7 @@
</x:javadoc>
</target>

- <target name="junit-report">
+ <target name="junit-report" depends="test">
<mkdir dir="target/reports/junit"/>
<junitreport todir="target/reports/junit">
<fileset dir=".">

Modified: staging/transit/plugin/build.xml
==============================================================================
--- staging/transit/plugin/build.xml (original)
+++ staging/transit/plugin/build.xml Tue Jan 18 17:07:36 2005
@@ -18,7 +18,7 @@
limitations under the License.
-->

-<project name="dpml-transit-plugin" default="dist" basedir="."
+<project name="dpml-transit-plugin" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -38,12 +38,11 @@
<x:export class="net.dpml.transit.control.CommandHandler"/>
</target>

+ <!--
<target name="bin" depends="install">
<echo>
-#----------------------------------------------------------------------------------
# Updating DPML HOME bin directory.
# Directory: ${dpml.home}/bin
-#----------------------------------------------------------------------------------
</echo>
<mkdir dir="${dpml.home}/bin"/>
<copy todir="${dpml.home}/bin">
@@ -68,5 +67,5 @@
</fileset>
</jar>
</target>
-
+ -->
</project>



  • svn commit: r1525 - in staging: . transit transit/handler transit/plugin, mcconnell, 01/18/2005

Archive powered by MHonArc 2.6.24.

Top of Page