Mail Archive Home | gotm-commits List | June 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, June 28, 2005 @ 10:18:41
Author: rouvoy
Path: /cvsroot/gotm/fractal-import
Added: alias.properties alias.xml
Modified: build.xml
Removed: build.properties
* extracting the alias definitions from the build.xml (alias.xml).
* renaming the build.properties file into alias.properties.
------------------+
alias.properties | 36 +++++++++
alias.xml | 174 ++++++++++++++++++++++++++++++++++++++++++++
build.properties | 29 -------
build.xml | 205 +++++++++--------------------------------------------
4 files changed, 248 insertions(+), 196 deletions(-)
Index: fractal-import/alias.properties
diff -u /dev/null fractal-import/alias.properties:1.1
--- /dev/null Tue Jun 28 10:18:41 2005
+++ fractal-import/alias.properties Tue Jun 28 10:18:41 2005
@@ -0,0 +1,36 @@
+ant.dir = ant
+cfg.dir = cfg
+class.dir = class
+doc.dir = doc
+dtd.dir = dtd
+fractal.dir = fractal
+idl.dir = idl
+java.dir = java
+julia.dir = julia
+lib.dir = lib
+log.dir = monolog
+meta.dir = META-INF
+pics.dir = pics
+src.dir = src
+xdt.dir = xdt
+xml.dir = xml
+
+output.dir = ${basedir}/output
+build.dir = ${output.dir}/build
+dist.dir = ${output.dir}/dist
+
+debug = off
+verbose = off
+optimize = on
+deprecation = off
+nowarn = off
+fork = off
+force = off
+build.compiler = modern
+
+jdoc.author = true
+jdoc.version = true
+jdoc.use = true
+jdoc.private = true
+jdoc.windowtitle = GoTM Transaction Framework
+jdoc.overview = ${doc.dir}/overview.html
\ No newline at end of file
Index: fractal-import/alias.xml
diff -u /dev/null fractal-import/alias.xml:1.1
--- /dev/null Tue Jun 28 10:18:41 2005
+++ fractal-import/alias.xml Tue Jun 28 10:18:41 2005
@@ -0,0 +1,174 @@
+<!-- ==================================================================== -->
+<!-- ObjectWeb GoTM is an open Tx Monitor Project -->
+<!-- Contact: http://www.objectweb.org -->
+<!-- This library is free software; you can redistribute it and/or -->
+<!-- modify it under the terms of the GNU Lesser General Public -->
+<!-- License as published by the Free Software Foundation; either -->
+<!-- version 2.1 of the License, or any later version. -->
+<!-- This library is distributed in the hope that it will be useful, -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
+<!-- Lesser General Public License for more details. -->
+<!-- You should have received a copy of the GNU Lesser General Public -->
+<!-- License along with this library; if not, write to the Free Software -->
+<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
+<!-- USA -->
+<!-- Initial developer(s): Romain Rouvoy. -->
+<!-- Contributor(s): ______________________________________. -->
+<!-- $Id: alias.xml,v 1.1 2005/06/28 08:18:41 rouvoy Exp $ -->
+<!-- ==================================================================== -->
+
+<project name="Fractal aliases" default="clean">
+ <description>
+ GoTM Project [http://gotm.objectweb.org] - Fractal Import module.
+ This module contains all the libraries, tools, configuration used in the
+ various modules of the GoTM project.
+ </description>
+
+
+ <!-- ==================== -->
+ <!-- PROPERTY DEFINITIONS -->
+ <!-- ==================== -->
+ <dirname property="module" file="${ant.file.Fractal aliases}"/>
+ <property file="${module}/alias.properties" />
+
+
+ <!-- ================ -->
+ <!-- PATH DEFINITIONS -->
+ <!-- ================ -->
+
+ <path id="ant.path">
+ <fileset dir="${build.dir}" includes="${ant.dir}/**/*.jar" />
+ <fileset dir="${basedir}" includes="${ant.dir}/**/*.jar" />
+ </path>
+
+
+ <!-- ================== -->
+ <!-- TARGET DEFINITIONS -->
+ <!-- ================== -->
+
+ <target name="clean" description="Cleans the module.">
+ <delete dir="${output.dir}" failonerror="no" />
+ <delete file="${basedir}/alias.xml" failonerror="no"/>
+ <delete file="${basedir}/alias.properties" failonerror="no"/>
+ </target>
+
+ <target name="clear">
+ <delete dir="${build.dir}/${class.dir}" failonerror="false" />
+ <delete dir="${build.dir}/${java.dir}" failonerror="false" />
+ </target>
+
+ <target name="fractal-adl" depends="-fcDoclet">
+ <mkdir dir="${build.dir}/${class.dir}" />
+ <fcDoclet>
+ <fileset dir="${basedir}/${src.dir}/${java.dir}" includes="**/*.java"
/>
+ </fcDoclet>
+ <copy todir="${build.dir}/${class.dir}" failonerror="false">
+ <fileset dir="${basedir}/${src.dir}/${fractal.dir}">
+ <include name="**/*.fractal" />
+ </fileset>
+ </copy>
+ </target>
+
+
+ <!-- ================= -->
+ <!-- ALIAS DEFINITIONS -->
+ <!-- ================= -->
+
+ <presetdef name="check">
+ <uptodate property="compile">
+ <srcfiles dir="${basedir}/${src.dir}" includes="**/*" />
+ </uptodate>
+ </presetdef>
+
+ <presetdef name="java.c">
+ <javac destdir="${build.dir}/${class.dir}"
+ debug="${debug}"
+ verbose="${verbose}"
+ optimize="${optimize}"
+ deprecation="${deprecation}"
+ nowarn="${nowarn}"
+ fork="${fork}"
+ compiler="${build.compiler}">
+ <classpath refid="classpath" />
+ <include name="**/*.java" />
+ <compilerarg line="-Xlint:unchecked"/>
+ </javac>
+ </presetdef>
+
+ <presetdef name="copy.dist">
+ <copy todir="${dist-src.dir}"
+ includeemptydirs="no"
+ overwrite="on"
+ failonerror="no">
+ <fileset dir="${basedir}">
+ <include name="**/*" />
+ <exclude name="output/**" />
+ </fileset>
+ </copy>
+ </presetdef>
+
+ <macrodef name="java.doc">
+<!-- <element name="jdoc-elements"/>-->
+ <sequential>
+ <javadoc destdir="${build.dir}/${doc.dir}"
+ author="${jdoc.author}"
+ version="${jdoc.version}"
+ use="${jdoc.use}"
+ private="${jdoc.use}"
+ windowtitle="${jdoc.windowtitle}"
+ overview="${jdoc.overview}"
+ classpathref="classpath">
+ <packageset dir="${basedir}/${src.dir}/${java.dir}"
+ defaultexcludes="yes"
+ includes="**/*" />
+<!-- <jdoc-elements/>-->
+ </javadoc>
+ <copy todir="${build.dir}/${doc.dir}" failonerror="no">
+ <fileset dir="${basedir}/${doc.dir}" includes="**/*.*" />
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="archive">
+ <attribute name="dir"/>
+ <attribute name="includes"/>
+ <sequential>
+ <zip zipfile="@{dir}/@{includes}.zip">
+ <fileset dir="@{dir}" includes="@{includes}/**/*" />
+ </zip>
+ <tar destfile="@{dir}/@{includes}.tar" longfile="gnu">
+ <tarfileset dir="@{dir}" includes="@{includes}/**/*" />
+ </tar>
+ <gzip src="@{dir}/@{includes}.tar"
+ zipfile="@{dir}/@{includes}.tar.gz" />
+ <bzip2 src="@{dir}/@{includes}.tar"
+ zipfile="@{dir}/@{includes}.tar.bz2" />
+ </sequential>
+ </macrodef>
+
+ <!-- ================ -->
+ <!-- TASK DEFINITIONS -->
+ <!-- ================ -->
+
+ <target name="-xdoclet">
+ <taskdef name="xdoclet" classname="xdoclet.DocletTask"
classpathref="ant.path"/>
+ </target>
+
+ <target name="-fcDoclet" depends="-xdoclet">
+ <taskdef name="xdoclet" classname="xdoclet.DocletTask"
classpathref="ant.path"/>
+ <presetdef name="fcDoclet">
+ <xdoclet destdir="${build.dir}/${class.dir}"
+ excludedtags="@version,@author,@todo"
+ verbose="${verbose}">
+ <fractal-primitive />
+ <fractal-template />
+ </xdoclet>
+ </presetdef>
+ </target>
+
+ <target name="-fcIDL">
+ <taskdef name="idl2java" classname="idldepend.IDLCheckerTask"
classpathref="ant.path"/>
+ <taskdef name="idl2fc"
classname="org.objectweb.fractal.corba.compiler.FcCorbaTask"
classpathref="ant.path"/>
+ </target>
+</project>
\ No newline at end of file
Index: fractal-import/build.properties
diff -u fractal-import/build.properties:1.3
fractal-import/build.properties:removed
--- fractal-import/build.properties:1.3 Tue Apr 19 11:24:03 2005
+++ fractal-import/build.properties Tue Jun 28 10:18:41 2005
@@ -1,29 +0,0 @@
-ant.dir = ant
-cfg.dir = cfg
-class.dir = class
-doc.dir = doc
-dtd.dir = dtd
-fractal.dir = fractal
-idl.dir = idl
-java.dir = java
-julia.dir = julia
-lib.dir = lib
-log.dir = monolog
-meta.dir = META-INF
-pics.dir = pics
-src.dir = src
-xdt.dir = xdt
-xml.dir = xml
-
-output.dir = ${basedir}/output
-build.dir = ${output.dir}/build
-dist.dir = ${output.dir}/dist
-
-debug = off
-verbose = off
-optimize = on
-deprecation = off
-nowarn = off
-fork = off
-force = off
-build.compiler = modern
\ No newline at end of file
Index: fractal-import/build.xml
diff -u fractal-import/build.xml:1.3 fractal-import/build.xml:1.4
--- fractal-import/build.xml:1.3 Tue Apr 19 11:24:03 2005
+++ fractal-import/build.xml Tue Jun 28 10:18:41 2005
@@ -15,232 +15,103 @@
<!-- USA -->
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.3 2005/04/19 09:24:03 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.4 2005/06/28 08:18:41 rouvoy Exp $ -->
<!-- ==================================================================== -->
-<project name="Fractal commons" default="clean">
+<project name="Fractal commons" default="copy-alias">
<description>
GoTM Project [http://gotm.objectweb.org] - Fractal Import module.
This module contains all the libraries, tools, configuration used in the
various modules of the GoTM project.
</description>
-
+
<!-- ==================== -->
<!-- PROPERTY DEFINITIONS -->
<!-- ==================== -->
+
<dirname property="module" file="${ant.file.Fractal commons}"/>
- <property file="${module}/build.properties"/>
-
+ <import file="${module}/alias.xml"/>
+
+
<!-- ================== -->
<!-- TARGET DEFINITIONS -->
<!-- ================== -->
- <target name="clean" description="Cleans the module.">
- <delete dir="${output.dir}" failonerror="false"/>
- </target>
- <target name="clear">
- <delete dir="${build.dir}/${class.dir}" failonerror="false"/>
- <delete dir="${build.dir}/${java.dir}" failonerror="false"/>
- </target>
-
- <target name="fractal-adl" depends="-fc.xdoclet">
- <mkdir dir="${build.dir}/${class.dir}" />
- <fc.xdoclet>
- <fileset dir="${basedir}/${src.dir}/${java.dir}" includes="**/*.java"/>
- </fc.xdoclet>
- <copy todir="${build.dir}/${class.dir}" failonerror="false">
- <fileset dir="${basedir}/${src.dir}/${fractal.dir}">
- <include name="**/*.fractal" />
- </fileset>
- </copy>
+ <target name="copy-alias">
+ <copy file="${module}/alias.xml" todir="${basedir}"/>
+ <copy file="${module}/alias.properties" todir="${basedir}"/>
</target>
-
- <!-- ================= -->
- <!-- ALIAS DEFINITIONS -->
- <!-- ================= -->
- <presetdef name="check">
- <uptodate property="compile">
- <srcfiles dir="${basedir}/${src.dir}" includes="**/*"/>
- </uptodate>
- </presetdef>
-
- <presetdef name="java.c">
- <javac destdir="${build.dir}/${class.dir}"
- debug="${debug}"
- verbose="${verbose}"
- optimize="${optimize}"
- deprecation="${deprecation}"
- nowarn="${nowarn}"
- fork="${fork}"
- compiler="${build.compiler}">
- <classpath refid="classpath" />
- <include name="**/*.java"/>
- </javac>
- </presetdef>
-
- <presetdef name="java.doc">
- <sequential>
- <javadoc destdir="${build.dir}/${doc.dir}" author="true"
version="true"
- use="true" private="true" windowtitle="GoTM Library."
- overview="${doc.dir}/overview.html" classpathref="classpath">
- <packageset dir="${basedir}/${src.dir}/${java.dir}"
defaultexcludes="yes">
- <include name="**/*" />
- </packageset>
- <doctitle> <![CDATA[<h1>XDoclet Library - v.
${fractalxdoclet.version}</h1>]]>
- <![CDATA[<h2>Library Specification</h2>]]> </doctitle>
- <tag name="todo" scope="all" description="To do: " />
- <group title="Fractal Libraries">
- <package name="org.objectweb.fractal.*" />
- </group>
- <group title="GoTM Libraries">
- <package name="org.objectweb.gotm.*" />
- </group>
- <link href="http://java.sun.com/j2se/1.4.2/docs/api/"; />
- <link href="http://xdoclet.sourceforge.net/xdoclet/api/"; />
- </javadoc>
- <replace file="${build.dir}/${doc.dir}/overview-summary.html"
- token="DO NOT REMOVE THIS LINE (will be automatically removed)." />
- <copy todir="${build.dir}/${doc.dir}">
- <fileset dir="${basedir}/${doc.dir}" includes="uml/*.png" />
- </copy>
- </sequential>
- </presetdef>
+
<!-- ================== -->
<!-- EXTERNAL LIBRARIES -->
<!-- ================== -->
+
<target name="-fractal">
- <mkdir dir="${build.dir}/${lib.dir}"/>
- <copy todir="${build.dir}/${lib.dir}">
- <mapper type="flatten"/>
- <fileset dir="${module}/${lib.dir}">
- <include name="fractal/**/*.jar"/>
- <include name="fractal-adl/**/*.jar"/>
- <include name="asm/**/*.jar"/>
- <include name="julia/**/*.jar"/>
- <include name="monolog/**/*.jar"/>
- <include name="utils/**/*.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${build.dir}/${cfg.dir}"/>
- <copy todir="${build.dir}/${cfg.dir}">
- <mapper type="flatten"/>
+ <mkdir dir="${build.dir}/${lib.dir}" />
+ <copy todir="${build.dir}/${lib.dir}" failonerror="no">
+ <mapper type="flatten" />
<fileset dir="${module}/${lib.dir}">
- <include name="**/*.cfg"/>
- <include name="**/*.properties"/>
+ <include name="fractal/**/*.*" />
+ <include name="fractal-adl/**/*.jar" />
+ <include name="asm/**/*.jar" />
+ <include name="julia/**/*.jar" />
+ <include name="monolog/**/*.*" />
+ <include name="utils/**/*.jar" />
</fileset>
</copy>
</target>
-
+
<target name="-fractal.explorer">
- <mkdir dir="${build.dir}/${lib.dir}"/>
+ <mkdir dir="${build.dir}/${lib.dir}" />
<copy todir="${build.dir}/${lib.dir}">
- <mapper type="flatten"/>
+ <mapper type="flatten" />
<fileset dir="${module}/${lib.dir}">
- <include name="apollon/**/*.jar"/>
- <include name="fractal-explorer/**/*.jar"/>
- <include name="xerces/**/*.jar"/>
+ <include name="apollon/**/*.jar" />
+ <include name="fractal-explorer/**/*.jar" />
+ <include name="xerces/**/*.jar" />
</fileset>
</copy>
</target>
+
<!-- ================== -->
<!-- INTERNAL LIBRARIES -->
<!-- ================== -->
+
<target name="-fractal.xdoclet">
<ant dir="${module}/../fractal-xdoclet" target="import" />
- <taskdef name="xdoclet" classname="xdoclet.DocletTask">
- <classpath>
- <fileset dir="${build.dir}/${ant.dir}" includes="**/*.jar"/>
- </classpath>
- </taskdef>
- <presetdef name="fc.xdoclet">
- <xdoclet destdir="${build.dir}/${class.dir}"
- excludedtags="@version,@author,@todo" verbose="${verbose}">
- <fractal-primitive/>
- <fractal-template/>
- </xdoclet>
- </presetdef>
</target>
-
+
<target name="-fractal.template">
- <ant dir="${module}/../fractal-template" target="import"/>
+ <ant dir="${module}/../fractal-template" target="import" />
</target>
<target name="-fractal.pool">
- <ant dir="${module}/../fractal-pool" target="import"/>
+ <ant dir="${module}/../fractal-pool" target="import" />
</target>
<target name="-fractal.corba">
- <ant dir="${module}/../fractal-corba" target="import"/>
+ <ant dir="${module}/../fractal-corba" target="import" />
</target>
<target name="-gotm">
- <ant dir="${module}/../gotm" target="import"/>
+ <ant dir="${module}/../gotm" target="import" />
</target>
<target name="-gotm.model">
- <ant dir="${module}/../gotm-model" target="import"/>
+ <ant dir="${module}/../gotm-model" target="import" />
</target>
<target name="-gotm.explorer">
- <ant dir="${module}/../gotm-explorer" target="import"/>
+ <ant dir="${module}/../gotm-explorer" target="import" />
</target>
<target name="-gotm.jts">
- <ant dir="${module}/../gotm-jts" target="import"/>
+ <ant dir="${module}/../gotm-jts" target="import" />
</target>
<target name="-gotm.ots">
- <ant dir="${module}/../gotm-ots" target="import"/>
- </target>
-
- <!-- ================ -->
- <!-- TASK DEFINITIONS -->
- <!-- ================ -->
- <target name="-check.lib">
- <available file="${build.dir}/${lib.dir}" type="dir" property="lib.ok"/>
- </target>
-
- <target name="-xdoclet.lib" if="lib.ok">
- <taskdef name="xdoclet" classname="xdoclet.DocletTask">
- <classpath>
- <fileset dir="${build.dir}/${ant.dir}" includes="**/*.jar"/>
- <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="-xdoclet.ant" unless="lib.ok">
- <taskdef name="xdoclet" classname="xdoclet.DocletTask">
- <classpath>
- <fileset dir="${build.dir}/${ant.dir}" includes="**/*.jar"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="-xdoclet" depends="-check.lib,-xdoclet.lib,-xdoclet.ant"/>
-
- <target name="-fc.xdoclet" depends="-xdoclet">
- <presetdef name="fc.xdoclet">
- <xdoclet destdir="${build.dir}/${class.dir}" verbose="${verbose}"
- excludedtags="@version,@author,@todo" force="${force}">
- <fractal-primitive/>
- <fractal-template/>
- </xdoclet>
- </presetdef>
- </target>
-
- <target name="-fc.corba">
- <taskdef name="idl2java" classname="idldepend.IDLCheckerTask">
- <classpath>
- <fileset dir="${build.dir}/${ant.dir}" includes="**/*.jar"/>
- </classpath>
- </taskdef>
- <taskdef name="idl2fc"
classname="org.objectweb.fractal.corba.compiler.FcCorbaTask">
- <classpath>
- <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
- </classpath>
- </taskdef>
+ <ant dir="${module}/../gotm-ots" target="import" />
</target>
</project>
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.