Mail Archive Home | gotm-commits List | December 2004 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Friday, December 17, 2004 @ 17:49:13
Author: rouvoy
Path: /cvsroot/gotm/fractal-xdoclet
Modified: build.xml example/build.xml
example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal
src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java
* Updating example for supoprting controller tag in the build.xml,
* Updating ADL file definition of the HelloWolrd composite, removing one
parameter,
* Cosmetic Updates.
----------------------------------------------------------------------+
build.xml | 327
+++++-----
example/build.xml | 4
example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal | 2
src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java | 6
4 files changed, 170 insertions(+), 169 deletions(-)
Index: fractal-xdoclet/build.xml
diff -u fractal-xdoclet/build.xml:1.1 fractal-xdoclet/build.xml:1.2
--- fractal-xdoclet/build.xml:1.1 Thu Dec 16 17:57:18 2004
+++ fractal-xdoclet/build.xml Fri Dec 17 17:49:13 2004
@@ -1,185 +1,186 @@
<!-- ==================================================================== -->
-
<!-- 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: build.xml,v 1.1 2004/12/16 16:57:18 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.2 2004/12/17 16:49:13 rouvoy Exp $ -->
<!-- ==================================================================== -->
-
<project name="fractal-xdoclet" default="xdoclet-all">
- <description>GoTM Project [gotm.objectweb.org] - Fractal
Xdoclet</description>
-
- <!-- ==================== -->
- <!-- PROPERTY DEFINITIONS -->
- <!-- ==================== -->
-
- <property name="src.dir" value="src" />
- <property name="doc.dir" value="doc" />
- <property name="class.dir" value="class" />
- <property name="lib.dir" value="lib" />
- <property name="ant.dir" value="ant" />
- <property name="meta.dir" value="META-INF" />
-
- <property name="java.dir" value="${src.dir}/java" />
- <property name="xml.dir" value="${src.dir}/xml" />
- <property name="xdt.dir" value="${src.dir}/xdt" />
-
- <property name="build.dir" value="${basedir}/build" />
- <property name="dist.dir" value="${basedir}/dist" />
-
- <property name="fractalxdoclet.jar" value="fractal-xdoclet.jar" />
- <property name="fractalxdoclet.version" value="0.1" />
- <property name="project.dist" value="FractalXdoclet" />
-
- <!-- ================ -->
- <!-- PATH DEFINITIONS -->
- <!-- ================ -->
-
- <path id="classpath">
- <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar" />
- <pathelement location="${build.dir}/${class.dir}" />
- </path>
+ <description>GoTM Project [gotm.objectweb.org] - Fractal
Xdoclet</description>
- <!-- ================== -->
- <!-- TARGET DEFINITIONS -->
- <!-- ================== -->
-
- <target name="xdoclet-all" description="xdoclet-clean +
xdoclet-build">
- <antcall target="xdoclet-clean" />
- <antcall target="xdoclet-build" />
- </target>
-
- <target name="-xdoclet-prepare">
+ <!-- ==================== -->
+ <!-- PROPERTY DEFINITIONS -->
+ <!-- ==================== -->
+ <property name="src.dir" value="src" />
+ <property name="doc.dir" value="doc" />
+ <property name="class.dir" value="class" />
+ <property name="lib.dir" value="lib" />
+ <property name="ant.dir" value="ant" />
+ <property name="meta.dir" value="META-INF" />
+ <property name="java.dir" value="${src.dir}/java" />
+ <property name="xml.dir" value="${src.dir}/xml" />
+ <property name="xdt.dir" value="${src.dir}/xdt" />
+ <property name="build.dir" value="${basedir}/build" />
+ <property name="dist.dir" value="${basedir}/dist" />
+ <property name="fractalxdoclet.jar" value="fractal-xdoclet.jar" />
+ <property name="fractalxdoclet.version" value="0.1" />
+ <property name="project.dist" value="FractalXdoclet" />
+
+ <!-- ================ -->
+ <!-- PATH DEFINITIONS -->
+ <!-- ================ -->
+ <path id="classpath">
+ <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar" />
+ <pathelement location="${build.dir}/${class.dir}" />
+ </path>
+
+ <!-- ================== -->
+ <!-- TARGET DEFINITIONS -->
+ <!-- ================== -->
+ <target name="xdoclet-all" description="xdoclet-clean + xdoclet-build">
+ <antcall target="xdoclet-clean" />
+ <antcall target="xdoclet-build" />
+ </target>
+
+ <target name="-xdoclet-prepare">
<mkdir dir="${build.dir}/${lib.dir}" />
- <copy todir="${build.dir}/${lib.dir}">
- <mapper type="flatten" />
- <fileset dir="${basedir}/${lib.dir}"
includes="**/*.jar" />
- </copy>
- </target>
-
- <target name="xdoclet-compile" depends="-xdoclet-prepare"
description="Compiles Fractal library.">
- <mkdir dir="${build.dir}/${class.dir}" />
- <javac srcdir="${basedir}/${java.dir}"
destdir="${build.dir}/${class.dir}" debug="on">
- <classpath refid="classpath" />
- <include
name="org/objectweb/fractal/xdoclet/**/*.java" />
- </javac>
- </target>
-
- <target name="xdoclet-deploy" depends="xdoclet-compile">
- <taskdef name="xdoclet" classname="xdoclet.DocletTask"
classpathref="classpath" />
- <property name="build.xdoc"
value="${build.dir}/${class.dir}/${meta.dir}" />
- <mkdir dir="${build.xdoc}" />
- <xdoclet destdir="${build.xdoc}" verbose="true">
- <fileset dir="${java.dir}">
- <include name="**/*Handler.java" />
- <include name="**/*SubTask.java" />
- </fileset>
- <template
templateFile="${basedir}/${lib.dir}/xdoclet/xdoclet-xml.xdt"
destinationFile="xdoclet.xml" />
- </xdoclet>
- <copy todir="${build.xdoc}">
- <fileset dir="${xml.dir}" includes="**/*.xml" />
- </copy>
- <property name="build.res"
value="${build.dir}/${class.dir}/org/objectweb/fractal/xdoclet/resources" />
- <mkdir dir="${build.res}" />
- <copy todir="${build.res}">
- <fileset dir="${xdt.dir}" includes="**/*.xdt" />
- </copy>
- </target>
-
- <target name="xdoclet-build" depends="xdoclet-deploy"
description="Builds Fractal framework.">
- <jar destfile="${build.dir}/${lib.dir}/${fractalxdoclet.jar}">
- <fileset dir="${build.dir}/${class.dir}"
includes="**/*" />
- </jar>
- </target>
-
- <target name="xdoclet-jdoc" depends="-xdoclet-prepare"
description="Generates the javadoc.">
- <javadoc destdir="${build.dir}/${doc.dir}" author="true"
version="true" use="true" private="true" windowtitle="Fractal Library."
overview="${doc.dir}/overview.html" classpathref="classpath">
- <packageset dir="${basedir}/${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: " />
- <tag name="fractal.adl" scope="all" description="Fractal ADL
Identifier: " />
-
- <group title="Fractal Libraries">
- <package name="org.objectweb.fractal.lib.*" />
- </group>
-
- <link href="http://java.sun.com/j2se/1.4.2/docs/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>
-</target>
-
-
-<target name="xdoclet-dist-src" description="Builds the source
distribution.">
-<property name="dist-src"
value="${project.dist}-${fractalxdoclet.version}-src" />
-<property name="dist-src.dir" value="${dist.dir}/${dist-src}" />
-<mkdir dir="${dist-src.dir}" />
-<copy todir="${dist-src.dir}" file="${basedir}/build.xml" />
-<mkdir dir="${dist-src.dir}/${src.dir}" />
-<copy todir="${dist-src.dir}/${src.dir}">
- <fileset dir="${basedir}/${src.dir}" includes="**/*" />
-</copy>
-<mkdir dir="${dist-src.dir}/${doc.dir}" />
-<copy todir="${dist-src.dir}/${doc.dir}">
- <fileset dir="${basedir}/${doc.dir}" includes="**/*" />
-</copy>
-<zip zipfile="${dist.dir}/${dist-src}.zip">
- <fileset dir="${dist.dir}" includes="${dist-src}/**/*" />
-</zip>
-<tar destfile="${dist.dir}/${dist-src}.tar" longfile="gnu">
- <tarfileset dir="${dist.dir}" includes="${dist-src}/**/*" />
-</tar>
-<gzip src="${dist.dir}/${dist-src}.tar"
zipfile="${dist.dir}/${dist-src}.tar.gz" />
-<bzip2 src="${dist.dir}/${dist-src}.tar"
zipfile="${dist.dir}/${dist-src}.tar.bz2" />
-</target>
-
-<target name="xdoclet-dist-bin" depends="xdoclet-build,xdoclet-jdoc"
description="Builds the binary distribution.">
-<property name="dist-bin"
value="${project.dist}-${fractalxdoclet.version}-bin" />
-<property name="dist-bin.dir" value="${dist.dir}/${dist-bin}" />
-<mkdir dir="${dist-bin.dir}" />
-<copy todir="${dist-bin.dir}">
- <fileset dir="${build.dir}" includes="${doc.dir}/**/*" />
- <fileset dir="${build.dir}" includes="${lib.dir}/**/*" />
-</copy>
-<zip zipfile="${dist.dir}/${dist-bin}.zip">
- <fileset dir="${dist.dir}" includes="${dist-bin}/**/*" />
-</zip>
-<tar destfile="${dist.dir}/${dist-bin}.tar" longfile="gnu">
- <tarfileset dir="${dist.dir}" includes="${dist-bin}/**/*" />
-</tar>
-<gzip src="${dist.dir}/${dist-bin}.tar"
zipfile="${dist.dir}/${dist-bin}.tar.gz" />
-<bzip2 src="${dist.dir}/${dist-bin}.tar"
zipfile="${dist.dir}/${dist-bin}.tar.bz2" />
-</target>
-
-<target name="xdoclet-dist" depends="xdoclet-dist-src,xdoclet-dist-bin"
description="build all distributions" />
-
-<target name="xdoclet-clean" description="clean Fractal framework">
-<delete dir="${build.dir}" failonerror="no" />
-<delete dir="${dist.dir}" failonerror="no" />
-</target>
+ <copy todir="${build.dir}/${lib.dir}">
+ <mapper type="flatten" />
+ <fileset dir="${basedir}/${lib.dir}" includes="**/*.jar" />
+ </copy>
+ </target>
+
+ <target name="xdoclet-compile" depends="-xdoclet-prepare"
+ description="Compiles Fractal library.">
+ <mkdir dir="${build.dir}/${class.dir}" />
+ <javac srcdir="${basedir}/${java.dir}"
destdir="${build.dir}/${class.dir}"
+ debug="on">
+ <classpath refid="classpath" />
+ <include name="org/objectweb/fractal/xdoclet/**/*.java" />
+ </javac>
+ </target>
+
+ <target name="xdoclet-deploy" depends="xdoclet-compile">
+ <taskdef name="xdoclet" classname="xdoclet.DocletTask"
+ classpathref="classpath" />
+ <property name="build.xdoc"
value="${build.dir}/${class.dir}/${meta.dir}" />
+ <mkdir dir="${build.xdoc}" />
+ <xdoclet destdir="${build.xdoc}" verbose="true">
+ <fileset dir="${java.dir}">
+ <include name="**/*Handler.java" />
+ <include name="**/*SubTask.java" />
+ </fileset>
+ <template templateFile="${basedir}/${lib.dir}/xdoclet/xdoclet-xml.xdt"
+ destinationFile="xdoclet.xml" />
+ </xdoclet>
+ <copy todir="${build.xdoc}">
+ <fileset dir="${xml.dir}" includes="**/*.xml" />
+ </copy>
+ <property name="build.res"
+
value="${build.dir}/${class.dir}/org/objectweb/fractal/xdoclet/resources"
+ />
+ <mkdir dir="${build.res}" />
+ <copy todir="${build.res}">
+ <fileset dir="${xdt.dir}" includes="**/*.xdt" />
+ </copy>
+ </target>
+
+ <target name="xdoclet-build" depends="xdoclet-deploy"
+ description="Builds Fractal framework.">
+ <jar destfile="${build.dir}/${lib.dir}/${fractalxdoclet.jar}">
+ <fileset dir="${build.dir}/${class.dir}" includes="**/*" />
+ </jar>
+ </target>
+
+ <target name="xdoclet-jdoc" depends="-xdoclet-prepare"
+ description="Generates the javadoc.">
+ <javadoc destdir="${build.dir}/${doc.dir}" author="true" version="true"
+ use="true" private="true" windowtitle="Fractal Library."
+ overview="${doc.dir}/overview.html" classpathref="classpath">
+ <packageset dir="${basedir}/${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: " />
+ <tag name="fractal.adl" scope="all"
+ description="Fractal ADL Identifier: " />
+ <group title="Fractal Libraries">
+ <package name="org.objectweb.fractal.lib.*" />
+ </group>
+ <link href="http://java.sun.com/j2se/1.4.2/docs/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>
+ </target>
+
+ <target name="xdoclet-dist-src" description="Builds the source
distribution.">
+ <property name="dist-src"
+ value="${project.dist}-${fractalxdoclet.version}-src" />
+ <property name="dist-src.dir" value="${dist.dir}/${dist-src}" />
+ <mkdir dir="${dist-src.dir}" />
+ <copy todir="${dist-src.dir}" file="${basedir}/build.xml" />
+ <mkdir dir="${dist-src.dir}/${src.dir}" />
+ <copy todir="${dist-src.dir}/${src.dir}">
+ <fileset dir="${basedir}/${src.dir}" includes="**/*" />
+ </copy>
+ <mkdir dir="${dist-src.dir}/${doc.dir}" />
+ <copy todir="${dist-src.dir}/${doc.dir}">
+ <fileset dir="${basedir}/${doc.dir}" includes="**/*" />
+ </copy>
+ <zip zipfile="${dist.dir}/${dist-src}.zip">
+ <fileset dir="${dist.dir}" includes="${dist-src}/**/*" />
+ </zip>
+ <tar destfile="${dist.dir}/${dist-src}.tar" longfile="gnu">
+ <tarfileset dir="${dist.dir}" includes="${dist-src}/**/*" />
+ </tar>
+ <gzip src="${dist.dir}/${dist-src}.tar"
+ zipfile="${dist.dir}/${dist-src}.tar.gz" />
+ <bzip2 src="${dist.dir}/${dist-src}.tar"
+ zipfile="${dist.dir}/${dist-src}.tar.bz2" />
+ </target>
+
+ <target name="xdoclet-dist-bin" depends="xdoclet-build,xdoclet-jdoc"
+ description="Builds the binary distribution.">
+ <property name="dist-bin"
+ value="${project.dist}-${fractalxdoclet.version}-bin" />
+ <property name="dist-bin.dir" value="${dist.dir}/${dist-bin}" />
+ <mkdir dir="${dist-bin.dir}" />
+ <copy todir="${dist-bin.dir}">
+ <fileset dir="${build.dir}" includes="${doc.dir}/**/*" />
+ <fileset dir="${build.dir}" includes="${lib.dir}/**/*" />
+ </copy>
+ <zip zipfile="${dist.dir}/${dist-bin}.zip">
+ <fileset dir="${dist.dir}" includes="${dist-bin}/**/*" />
+ </zip>
+ <tar destfile="${dist.dir}/${dist-bin}.tar" longfile="gnu">
+ <tarfileset dir="${dist.dir}" includes="${dist-bin}/**/*" />
+ </tar>
+ <gzip src="${dist.dir}/${dist-bin}.tar"
+ zipfile="${dist.dir}/${dist-bin}.tar.gz" />
+ <bzip2 src="${dist.dir}/${dist-bin}.tar"
+ zipfile="${dist.dir}/${dist-bin}.tar.bz2" />
+ </target>
+
+ <target name="xdoclet-dist" depends="xdoclet-dist-src,xdoclet-dist-bin"
+ description="build all distributions" />
+ <target name="xdoclet-clean" description="clean Fractal framework">
+ <delete dir="${build.dir}" failonerror="no" />
+ <delete dir="${dist.dir}" failonerror="no" />
+ </target>
</project>
Index: fractal-xdoclet/example/build.xml
diff -u fractal-xdoclet/example/build.xml:1.1
fractal-xdoclet/example/build.xml:1.2
--- fractal-xdoclet/example/build.xml:1.1 Thu Dec 16 17:57:18 2004
+++ fractal-xdoclet/example/build.xml Fri Dec 17 17:49:13 2004
@@ -21,7 +21,7 @@
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.1 2004/12/16 16:57:18 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.2 2004/12/17 16:49:13 rouvoy Exp $ -->
<!-- ==================================================================== -->
<project name="example-template" default="example-all">
@@ -111,7 +111,7 @@
<mkdir dir="${build.dir}/${class.dir}"/>
<xdoclet destdir="${build.dir}/${class.dir}"
excludedtags="@version,@author,@todo">
<fileset dir="${basedir}/${java.dir}"
includes="org/objectweb/fractal/example/**/*.java"/>
- <fractal-adl dtd="standard.dtd"/>
+ <fractal-adl controller="primitive"/>
</xdoclet>
</target>
Index:
fractal-xdoclet/example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal
diff -u
fractal-xdoclet/example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal:1.1
fractal-xdoclet/example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal:1.2
---
fractal-xdoclet/example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal:1.1
Thu Dec 16 17:57:18 2004
+++
fractal-xdoclet/example/src/fractal/org/objectweb/fractal/example/HelloWorld.fractal
Fri Dec 17 17:49:13 2004
@@ -4,7 +4,7 @@
<definition name="org.objectweb.fractal.example.HelloWorld">
<interface name="r" role="server" signature="java.lang.Runnable"/>
<component name="client"
definition="org.objectweb.fractal.example.lib.FcClientImpl"/>
- <component name="server"
definition="org.objectweb.fractal.example.lib.FcServerImpl(-->,2)"/>
+ <component name="server"
definition="org.objectweb.fractal.example.lib.FcServerImpl(-->)"/>
<binding client="this.r" server="client.r"/>
<binding client="client.s" server="server.s"/>
Index:
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java
diff -u
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java:1.1
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java:1.2
---
fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java:1.1
Thu Dec 16 17:57:19 2004
+++ fractal-xdoclet/src/java/org/objectweb/fractal/xdoclet/FcAdlSubTask.java
Fri Dec 17 17:49:13 2004
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: FcAdlSubTask.java,v 1.1 2004/12/16 16:57:19 rouvoy Exp $
+$Id: FcAdlSubTask.java,v 1.2 2004/12/17 16:49:13 rouvoy Exp $
====================================================================*/
package org.objectweb.fractal.xdoclet;
@@ -31,14 +31,14 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @created 15 déc. 2004
* @ant.element name="fractal-adl" parent="xdoclet.DocletTask"
display-name="Standard Subtask for Fractal ADL generation"
*/
public class FcAdlSubTask
extends TemplateSubTask
{
- private final static String FC_ADL_DTD = "basic.dtd";
+ private final static String FC_ADL_DTD = "standard.dtd";
private final static String FC_ADL_DEFAULT_TEMPLATE =
"resources/FractalADLDescriptor.xdt";
private final static String FC_PREFIX = "Fc";
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.