Mail Archive Home | gotm-commits List | Febuary 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Wednesday, February 23, 2005 @ 18:39:32
Author: rouvoy
Path: /cvsroot/gotm/fractal-template
Added: src/monolog/fractal.properties
Modified: build.xml lib/fractal-xdoclet/fractal-xdoclet.jar
Removed: src/monolog/monolog.properties
* Improvement of the GoTM library.
* Benchmark example to compare GoTM with JOTM.
* Moving compilation result into an "output" directory.
* Moving eclipse compilation to an "output/eclipse" directory.
* Cosmetic updates.
-----------------------------------------+
build.xml | 17 ++++-----
lib/fractal-xdoclet/fractal-xdoclet.jar | <<Binary file>>
src/monolog/fractal.properties | 55 ++++++++++++++++++++++++++++++
src/monolog/monolog.properties | 54 -----------------------------
4 files changed, 64 insertions(+), 62 deletions(-)
Index: fractal-template/build.xml
diff -u fractal-template/build.xml:1.6 fractal-template/build.xml:1.7
--- fractal-template/build.xml:1.6 Fri Jan 14 17:25:18 2005
+++ fractal-template/build.xml Wed Feb 23 18:39:32 2005
@@ -21,7 +21,7 @@
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.6 2005/01/14 16:25:18 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.7 2005/02/23 17:39:32 rouvoy Exp $ -->
<!-- ==================================================================== -->
<project name="fractal-template" default="fractal-all">
@@ -39,11 +39,12 @@
<property name="fractal.dir" value="fractal"/>
<property name="ant.dir" value="ant"/>
- <property name="java.dir" value="${src.dir}/java"/>
- <property name="log.dir" value="${src.dir}/monolog"/>
+ <property name="java.dir" value="java"/>
+ <property name="log.dir" value="monolog"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="dist.dir" value="${basedir}/dist"/>
+ <property name="out.dir" value="${basedir}/output"/>
+ <property name="build.dir" value="${out.dir}/build"/>
+ <property name="dist.dir" value="${out.dir}/dist"/>
<property name="project.jar" value="fractal-template.jar"/>
<property name="project.version" value="0.1"/>
@@ -81,7 +82,7 @@
<target name="fractal-compile" depends="-fractal-prepare"
description="Compiles Fractal library.">
<mkdir dir="${build.dir}/${class.dir}"/>
- <javac srcdir="${basedir}/${java.dir}"
+ <javac srcdir="${basedir}/${src.dir}/${java.dir}"
destdir="${build.dir}/${class.dir}" debug="on">
<classpath refid="classpath"/>
<include name="org/objectweb/fractal/lib/**/*.java"/>
@@ -104,7 +105,7 @@
<mkdir dir="${build.dir}/${class.dir}"/>
<xdoclet destdir="${build.dir}/${class.dir}"
excludedtags="@version,@author,@todo">
- <fileset dir="${basedir}/${java.dir}"
+ <fileset dir="${basedir}/${src.dir}/${java.dir}"
includes="org/objectweb/fractal/**/*.java"/>
<fractal-primitive/>
</xdoclet>
@@ -131,7 +132,7 @@
<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">
+ <packageset dir="${basedir}/${src.dir}/${java.dir}"
defaultexcludes="yes">
<include name="**/*" />
</packageset>
<doctitle>
Index: fractal-template/lib/fractal-xdoclet/fractal-xdoclet.jar
cvs rdiff: failed to read diff file header /tmp/cvsb96iPw for
fractal-xdoclet.jar,v: end of file
Index: fractal-template/src/monolog/fractal.properties
diff -u /dev/null fractal-template/src/monolog/fractal.properties:1.1
--- /dev/null Wed Feb 23 18:39:32 2005
+++ fractal-template/src/monolog/fractal.properties Wed Feb 23 18:39:32
2005
@@ -0,0 +1,55 @@
+# ====================================================================
+#
+# GoTM: GoTM is an open Transaction Monitor
+# Copyright (C) 2000-2004 INRIA - USTL - LIFL - GOAL
+# Contact: gotm@xxxxxxxxxxxxx
+#
+# 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: fractal.properties,v 1.1 2005/02/23 17:39:32 rouvoy Exp $
+# ====================================================================
+# Log configuration file #
+
+# Define which wrapper to use (= log4j)
+log.config.classname
org.objectweb.util.monolog.wrapper.log4j.MonologLoggerFactory
+
+# tty : simple console handler
+handler.tty.type Console
+handler.tty.output System.out
+#handler.tty.pattern <%h> [%-3t{1}]: %m%n
+handler.tty.pattern [%-3t{1}]: %m%n
+
+# logf : file handler with extended headers
+#handler.logf.type File
+#handler.logf.output gotm.log
+#handler.logf.pattern <%-3t{1}> [%10r] %7p - %m%n
+
+# root definition for all loggers
+logger.root.handler.0 tty
+logger.root.additivity false
+logger.root.level ERROR
+
+# Launcher Traces for handlers:
+# o tty --> prints logs to the standart output
+# o logf --> prints log to a file (monolog.log)
+
+logger.org.objectweb.fractal.handler.0 tty
+logger.org.objectweb.fractal.additivity false
+logger.org.objectweb.fractal.level ERROR
Index: fractal-template/src/monolog/monolog.properties
diff -u fractal-template/src/monolog/monolog.properties:1.1
fractal-template/src/monolog/monolog.properties:removed
--- fractal-template/src/monolog/monolog.properties:1.1 Tue Dec 14 09:58:44
2004
+++ fractal-template/src/monolog/monolog.properties Wed Feb 23 18:39:32
2005
@@ -1,54 +0,0 @@
-# ====================================================================
-#
-# GoTM: GoTM is an open Transaction Monitor
-# Copyright (C) 2000-2004 INRIA - USTL - LIFL - GOAL
-# Contact: gotm@xxxxxxxxxxxxx
-#
-# 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: monolog.properties,v 1.1 2004/12/14 08:58:44 rouvoy Exp $
-# ====================================================================
-# Log configuration file #
-
-# Define which wrapper to use (= log4j)
-log.config.classname
org.objectweb.util.monolog.wrapper.log4j.MonologLoggerFactory
-
-# tty : simple console handler
-handler.tty.type Console
-handler.tty.output System.out
-#handler.tty.pattern <%h> [%-3t{1}]: %m%n
-handler.tty.pattern [%-3t{1}]: %m%n
-
-# logf : file handler with extended headers
-#handler.logf.type File
-#handler.logf.output gotm.log
-#handler.logf.pattern <%-3t{1}> [%10r] %7p - %m%n
-
-# root definition for all loggers
-logger.root.handler.0 tty
-logger.root.level DEBUG
-
-# Launcher Traces for handlers:
-# o tty --> prints logs to the standart output
-# o logf --> prints log to a file (monolog.log)
-
-logger.org.objectweb.gotm.handler.0 tty
-logger.org.objectweb.gotm.additivity false
-logger.org.objectweb.gotm.level DEBUG
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.