Mail Archive Home | gotm-commits List | March 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Monday, March 14, 2005 @ 13:42:00
Author: rouvoy
Path: /cvsroot/gotm/fractal-import
Added: lib/apollon/apollon-runtime.jar
lib/fractal-explorer/basic-plugin.jar
lib/fractal-explorer/browser.jar
lib/fractal-explorer/fractal-browser.jar
lib/fractal-explorer/fractal-plugin.jar lib/log4j/LICENSE.log4j
lib/log4j/log4j-1.2.8.jar lib/xerces/xerces.jar
Modified: build.properties build.xml lib/monolog/monolog.properties
Removed: lib/monolog/LICENSE.log4j lib/monolog/log4j-1.2.8.jar
* Integrating JacORB with Fractal to provide CORBA-based support for Fractal
components.
* Adding new Xdoclet tag @julia.controller desc="" to specify a particular
controller descriptor to use.
* Updating the cache-controller to be supported correctly by composite
components.
* Adding fractal-corba module helloworld example.
* Fractal-explorer library moved from gotm-explorer to fractal-import module.
------------------------------------------+
build.properties | 11 ++++-
build.xml | 61 +++++++++++++++++++++++------
lib/apollon/apollon-runtime.jar | <<Binary file>>
lib/fractal-explorer/basic-plugin.jar | <<Binary file>>
lib/fractal-explorer/browser.jar | <<Binary file>>
lib/fractal-explorer/fractal-browser.jar | <<Binary file>>
lib/fractal-explorer/fractal-plugin.jar | <<Binary file>>
lib/log4j/LICENSE.log4j | 48 ++++++++++++++++++++++
lib/log4j/log4j-1.2.8.jar | <<Binary file>>
lib/monolog/LICENSE.log4j | 48 ----------------------
lib/monolog/log4j-1.2.8.jar | <<Binary file>>
lib/monolog/monolog.properties | 38 +++++-------------
lib/xerces/xerces.jar | <<Binary file>>
13 files changed, 118 insertions(+), 88 deletions(-)
Index: fractal-import/build.properties
diff -u fractal-import/build.properties:1.1
fractal-import/build.properties:1.2
--- fractal-import/build.properties:1.1 Wed Mar 2 16:22:57 2005
+++ fractal-import/build.properties Mon Mar 14 13:42:00 2005
@@ -3,6 +3,7 @@
class.dir = class
doc.dir = doc
fractal.dir = fractal
+idl.dir = idl
java.dir = java
julia.dir = julia
lib.dir = lib
@@ -13,9 +14,15 @@
xdt.dir = xdt
xml.dir = xml
-import.dir = ../gotm-import
output.dir = ${basedir}/output
build.dir = ${output.dir}/build
dist.dir = ${output.dir}/dist
-debug = on
\ No newline at end of file
+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.1 fractal-import/build.xml:1.2
--- fractal-import/build.xml:1.1 Wed Mar 2 16:22:57 2005
+++ fractal-import/build.xml Mon Mar 14 13:42:00 2005
@@ -15,7 +15,7 @@
<!-- USA -->
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.1 2005/03/02 15:22:57 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.2 2005/03/14 12:42:00 rouvoy Exp $ -->
<!-- ==================================================================== -->
<project name="Fractal commons" default="clean">
@@ -45,7 +45,9 @@
<target name="fractal-adl" depends="-fc.xdoclet">
<mkdir dir="${build.dir}/${class.dir}" />
- <fc.xdoclet/>
+ <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" />
@@ -58,9 +60,15 @@
<!-- ================= -->
<presetdef name="java.c">
<javac destdir="${build.dir}/${class.dir}"
- debug="${debug}">
+ debug="${debug}"
+ verbose="${verbose}"
+ optimize="${optimize}"
+ deprecation="${deprecation}"
+ nowarn="${nowarn}"
+ fork="${fork}"
+ compiler="${build.compiler}">
<classpath refid="classpath" />
- <include name="org/objectweb/**/*.java"/>
+ <include name="**/*.java"/>
</javac>
</presetdef>
@@ -118,6 +126,18 @@
</copy>
</target>
+ <target name="-fractal.explorer">
+ <mkdir dir="${build.dir}/${lib.dir}"/>
+ <copy todir="${build.dir}/${lib.dir}">
+ <mapper type="flatten"/>
+ <fileset dir="${module}/${lib.dir}">
+ <include name="apollon/**/*.jar"/>
+ <include name="fractal-explorer/**/*.jar"/>
+ <include name="xerces/**/*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ================== -->
<!-- INTERNAL LIBRARIES -->
<!-- ================== -->
@@ -130,8 +150,7 @@
</taskdef>
<presetdef name="fc.xdoclet">
<xdoclet destdir="${build.dir}/${class.dir}"
- excludedtags="@version,@author,@todo">
- <fileset dir="${basedir}/${src.dir}/${java.dir}"
includes="**/*.java"/>
+ excludedtags="@version,@author,@todo" verbose="${verbose}">
<fractal-primitive/>
<fractal-template/>
</xdoclet>
@@ -147,7 +166,7 @@
</target>
<target name="-fractal.corba">
- <ant dir="${module}/../fractal-pool" target="import"/>
+ <ant dir="${module}/../fractal-corba" target="import"/>
</target>
<target name="-gotm">
@@ -162,22 +181,40 @@
<ant dir="${module}/../gotm-jts" target="import"/>
</target>
+ <target name="-gotm.ots">
+ <ant dir="${module}/../gotm-ots" target="import"/>
+ </target>
+
<!-- ================ -->
<!-- TASK DEFINITIONS -->
<!-- ================ -->
- <target name="-xdoclet">
+ <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}"
- excludedtags="@version,@author,@todo">
- <fileset dir="${basedir}/${src.dir}/${java.dir}"
includes="**/*.java"/>
+ <xdoclet destdir="${build.dir}/${class.dir}" verbose="${verbose}"
+ excludedtags="@version,@author,@todo" force="${force}">
<fractal-primitive/>
<fractal-template/>
</xdoclet>
@@ -187,7 +224,7 @@
<target name="-fc.corba">
<taskdef name="idl2java" classname="idldepend.IDLCheckerTask">
<classpath>
- <fileset dir="${build.dir}${ant.dir}" includes="**/*.jar"/>
+ <fileset dir="${build.dir}/${ant.dir}" includes="**/*.jar"/>
</classpath>
</taskdef>
<taskdef name="idl2fc"
classname="org.objectweb.fractal.corba.compiler.FcCorbaTask">
Index: fractal-import/lib/apollon/apollon-runtime.jar
cvs rdiff: failed to read diff file header /tmp/cvsetPk1Z for
apollon-runtime.jar,v: end of file
Index: fractal-import/lib/fractal-explorer/basic-plugin.jar
cvs rdiff: failed to read diff file header /tmp/cvsF1Y5j1 for
basic-plugin.jar,v: end of file
Index: fractal-import/lib/fractal-explorer/browser.jar
cvs rdiff: failed to read diff file header /tmp/cvsAfgQw2 for browser.jar,v:
end of file
Index: fractal-import/lib/fractal-explorer/fractal-browser.jar
cvs rdiff: failed to read diff file header /tmp/cvsThvZGb for
fractal-browser.jar,v: end of file
Index: fractal-import/lib/fractal-explorer/fractal-plugin.jar
cvs rdiff: failed to read diff file header /tmp/cvsCfzZQc for
fractal-plugin.jar,v: end of file
Index: fractal-import/lib/log4j/LICENSE.log4j
diff -u /dev/null fractal-import/lib/log4j/LICENSE.log4j:1.1
--- /dev/null Mon Mar 14 13:42:00 2005
+++ fractal-import/lib/log4j/LICENSE.log4j Mon Mar 14 13:42:00 2005
@@ -0,0 +1,48 @@
+/*
+ *
============================================================================
+ * The Apache Software License, Version 1.1
+ *
============================================================================
+ *
+ * Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
modifica-
+ * tion, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
notice,
+ * this list of conditions and the following disclaimer in the
documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any,
must
+ * include the following acknowledgment: "This product includes
software
+ * developed by the Apache Software Foundation
(http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
if
+ * and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "log4j" and "Apache Software Foundation" must not be used
to
+ * endorse or promote products derived from this software without
prior
+ * written permission. For written permission, please contact
+ * apache@xxxxxxxxxxx
+ *
+ * 5. Products derived from this software may not be called "Apache", nor
may
+ * "Apache" appear in their name, without prior written permission of
the
+ * Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
individuals
+ * on behalf of the Apache Software Foundation. For more information on
the
+ * Apache Software Foundation, please see <http://www.apache.org/>.
+ *
+ */
Index: fractal-import/lib/log4j/log4j-1.2.8.jar
cvs rdiff: failed to read diff file header /tmp/cvssPxDn8 for
log4j-1.2.8.jar,v: end of file
Index: fractal-import/lib/monolog/LICENSE.log4j
diff -u fractal-import/lib/monolog/LICENSE.log4j:1.1
fractal-import/lib/monolog/LICENSE.log4j:removed
--- fractal-import/lib/monolog/LICENSE.log4j:1.1 Wed Mar 2 16:22:57
2005
+++ fractal-import/lib/monolog/LICENSE.log4j Mon Mar 14 13:42:00 2005
@@ -1,48 +0,0 @@
-/*
- *
============================================================================
- * The Apache Software License, Version 1.1
- *
============================================================================
- *
- * Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
notice,
- * this list of conditions and the following disclaimer in the
documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any,
must
- * include the following acknowledgment: "This product includes
software
- * developed by the Apache Software Foundation
(http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
if
- * and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "log4j" and "Apache Software Foundation" must not be used
to
- * endorse or promote products derived from this software without
prior
- * written permission. For written permission, please contact
- * apache@xxxxxxxxxxx
- *
- * 5. Products derived from this software may not be called "Apache", nor
may
- * "Apache" appear in their name, without prior written permission of
the
- * Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many
individuals
- * on behalf of the Apache Software Foundation. For more information on
the
- * Apache Software Foundation, please see <http://www.apache.org/>.
- *
- */
Index: fractal-import/lib/monolog/log4j-1.2.8.jar
cvs rdiff: failed to read diff file header /tmp/cvscyEa0i for
log4j-1.2.8.jar,v: end of file
Index: fractal-import/lib/monolog/monolog.properties
diff -u fractal-import/lib/monolog/monolog.properties:1.1
fractal-import/lib/monolog/monolog.properties:1.2
--- fractal-import/lib/monolog/monolog.properties:1.1 Wed Mar 2 16:22:57
2005
+++ fractal-import/lib/monolog/monolog.properties Mon Mar 14 13:42:00
2005
@@ -23,33 +23,19 @@
# Contributor(s):
#
# ====================================================================
-# $Id: monolog.properties,v 1.1 2005/03/02 15:22:57 rouvoy Exp $
+# $Id: monolog.properties,v 1.2 2005/03/14 12:42:00 rouvoy Exp $
# ====================================================================
# Log configuration file #
-# Define which wrapper to use (= log4j)
-log.config.classname
org.objectweb.util.monolog.wrapper.log4j.MonologLoggerFactory
+monolog.classname org.objectweb.util.monolog.wrapper.javaLog.LoggerFactory
-# 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
+# define a simple console handler
+handler.consoleHandler.type Console
+handler.consoleHandler.output System.out
+#handler.consoleHandler.pattern %l %m%n
+#handler.consoleHandler.pattern %l %d thread=%h topic=%t class=%O{1}
method=%M line=%L %m%n
+handler.consoleHandler.pattern [%t] %l: %m%n
+
+logger.root.level INFO
+logger.root.handler.0 consoleHandler
+#logger.org.objectweb.fractal.level DEBUG
\ No newline at end of file
Index: fractal-import/lib/xerces/xerces.jar
cvs rdiff: failed to read diff file header /tmp/cvsGwzLhg for xerces.jar,v:
end of file
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.