Mail Archive Home | gotm-commits List | Febuary 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Wednesday, February 23, 2005 @ 18:39:31
Author: rouvoy
Path: /cvsroot/gotm/gotm
Added: src/monolog/fractal.properties
Modified: build.xml lib/fractal-template/fractal-template.jar
src/java/org/objectweb/gotm/lib/CurrentHandler.java
src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java
src/java/org/objectweb/gotm/lib/resource/Resource.java
src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java
src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java
Removed: src/julia/gotm.cfg 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 | 45 --
lib/fractal-template/fractal-template.jar | <<Binary
file>>
src/java/org/objectweb/gotm/lib/CurrentHandler.java | 47 +-
src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java | 18
src/java/org/objectweb/gotm/lib/resource/Resource.java | 15
src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java | 13
src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java | 13
src/julia/gotm.cfg | 218
----------
src/monolog/fractal.properties | 59 ++
src/monolog/monolog.properties | 54 --
10 files changed, 157 insertions(+), 325 deletions(-)
Index: gotm/build.xml
diff -u gotm/build.xml:1.4 gotm/build.xml:1.5
--- gotm/build.xml:1.4 Fri Feb 4 18:44:33 2005
+++ gotm/build.xml Wed Feb 23 18:39:31 2005
@@ -21,7 +21,7 @@
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.4 2005/02/04 17:44:33 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.5 2005/02/23 17:39:31 rouvoy Exp $ -->
<!-- ==================================================================== -->
<project name="GoTM" default="gotm-all">
@@ -32,6 +32,7 @@
<!-- ==================== -->
<property name="src.dir" value="src"/>
+ <property name="java.dir" value="java"/>
<property name="doc.dir" value="doc"/>
<property name="class.dir" value="class"/>
<property name="lib.dir" value="lib"/>
@@ -40,8 +41,6 @@
<property name="ant.dir" value="ant"/>
<property name="log.dir" value="monolog"/>
- <property name="java.dir" value="${src.dir}/java"/>
-
<property name="out.dir" value="${basedir}/output"/>
<property name="build.dir" value="${out.dir}/build"/>
<property name="dist.dir" value="${out.dir}/dist"/>
@@ -67,10 +66,7 @@
<antcall target="gotm-build"/>
</target>
- <target name="-gotm-prepare">
- <ant dir="${basedir}/../ow-transaction" target="tx-build"/>
- <ant dir="${basedir}/../fractal-pool" target="pool-build"/>
-
+ <target name="-gotm-import">
<copy todir="${build.dir}/${lib.dir}" failonerror="false">
<mapper type="flatten"/>
<fileset dir="${basedir}/${lib.dir}" includes="**/*.jar"/>
@@ -85,28 +81,32 @@
<copy todir="${build.dir}/${class.dir}" failonerror="false">
<fileset dir="${basedir}/${src.dir}/${log.dir}"
includes="**/*.properties"/>
</copy>
+ </target>
+
+ <target name="-doclet-init">
+ <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="-gotm-prepare" depends="-gotm-import,-doclet-init">
+ <ant dir="${basedir}/../ow-transaction" target="tx-build"/>
+ <ant dir="${basedir}/../fractal-pool" target="pool-build"/>
</target>
<target name="gotm-compile" depends="-gotm-prepare">
<mkdir dir="${build.dir}/${class.dir}"/>
<javac srcdir="${basedir}/${src.dir}/${java.dir}"
- destdir="${build.dir}/${class.dir}">
+ destdir="${build.dir}/${class.dir}" debug="on">
<classpath refid="classpath"/>
<include name="org/objectweb/gotm/**/*.java"/>
</javac>
</target>
- <target name="-doclet-init" depends="-gotm-prepare">
- <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="gotm-doclet" depends="-doclet-init">
- <mkdir dir="${build.dir}/${class.dir}"/>
+ <target name="gotm-doclet">
<xdoclet destdir="${build.dir}/${class.dir}"
excludedtags="@version,@author,@todo">
<fileset dir="${basedir}/../ow-transaction/${src.dir}/${java.dir}"
@@ -118,11 +118,6 @@
<fileset dir="${basedir}/${src.dir}/${java.dir}"
includes="org/objectweb/gotm/**/*.java"/>
<fractal-primitive/>
- </xdoclet>
- <xdoclet destdir="${build.dir}/${class.dir}"
- excludedtags="@version,@author,@todo">
- <fileset dir="${basedir}/${src.dir}/${java.dir}"
- includes="org/objectweb/gotm/lib/**/*.java"/>
<fractal-template/>
</xdoclet>
</target>
@@ -135,7 +130,7 @@
</copy>
</target>
- <target name="gotm-build" depends="gotm-fractal,gotm-compile"
+ <target name="gotm-build" depends="gotm-compile,gotm-fractal"
description="Builds GoTM framework.">
<jar destfile="${build.dir}/${lib.dir}/${gotm.jar}">
<fileset dir="${build.dir}/${class.dir}"/>
Index: gotm/lib/fractal-template/fractal-template.jar
cvs rdiff: failed to read diff file header /tmp/cvsfUVGUH for
fractal-template.jar,v: end of file
Index: gotm/src/java/org/objectweb/gotm/lib/CurrentHandler.java
diff -u gotm/src/java/org/objectweb/gotm/lib/CurrentHandler.java:1.1
gotm/src/java/org/objectweb/gotm/lib/CurrentHandler.java:1.2
--- gotm/src/java/org/objectweb/gotm/lib/CurrentHandler.java:1.1 Fri
Feb 4 18:44:33 2005
+++ gotm/src/java/org/objectweb/gotm/lib/CurrentHandler.java Wed Feb 23
18:39:30 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: CurrentHandler.java,v 1.1 2005/02/04 17:44:33 rouvoy Exp $
+$Id: CurrentHandler.java,v 1.2 2005/02/23 17:39:30 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib;
@@ -32,6 +32,7 @@
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.IllegalCacheException;
import org.objectweb.fractal.api.control.IllegalLifeCycleException;
+import org.objectweb.fractal.api.control.LifeCycleController;
import org.objectweb.fractal.api.factory.Factory;
import org.objectweb.fractal.api.factory.InstantiationException;
import org.objectweb.fractal.lib.BindablePrimitive;
@@ -41,19 +42,20 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx">Romain Rouvoy</a>
* @created 1 févr. 2005
- * @modified $Date: 2005/02/04 17:44:33 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/02/23 17:39:30 $
+ * @version $Revision: 1.2 $
* @fractal.itf name="factory" role="client"
signature="org.objectweb.fractal.api.Component"
*/
public class CurrentHandler
extends BindablePrimitive
-implements CurrentManager
+implements CurrentManager, LifeCycleController
{
/** Fractal ADL Identifier for the <code>FACTORY</code> interface. */
public static final String FACTORY = "factory";
/** <code>current</code> . */
private Component current = null;
+ private Component cleared = null;
/* (non-Javadoc)
* @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
@@ -70,10 +72,22 @@
Component cpt = (Component) lookupFc(FACTORY);
return (Factory) cpt.getFcInterface("factory");
} catch (NoSuchInterfaceException e) {
+ getTrace().error(e.getMessage());
return null ;
}
}
+ private Component getCleared() {
+ if (this.cleared == null) {
+ try {
+ this.cleared = getFactory().newFcInstance();
+ } catch (InstantiationException e) {
+ e.printStackTrace();
+ }
+ }
+ return this.cleared ;
+ }
+
/* (non-Javadoc)
* @see org.objectweb.gotm.lib.CurrentManager#getCurrentFc()
*/
@@ -86,11 +100,9 @@
*/
public void createCurrentFc() {
try {
- this.current = getFactory().newFcInstance();
+ this.current = this.cleared ;
Fractal.getLifeCycleController(this.current).startFc();
FcCache.getCacheController(this.current).initFc();
- } catch (InstantiationException e) {
- getTrace().error(e.getMessage());
} catch (IllegalCacheException e) {
getTrace().error(e.getMessage());
} catch (IllegalLifeCycleException e) {
@@ -105,6 +117,7 @@
*/
public void setCurrentFc(Component c) {
this.current = c;
+ this.cleared = c;
}
/* (non-Javadoc)
@@ -118,5 +131,25 @@
} catch (NoSuchInterfaceException e) {
// Ignored
}
+ this.current = null;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.objectweb.fractal.api.control.LifeCycleController#getFcState()
+ */
+ public String getFcState() { return null; }
+
+ /* (non-Javadoc)
+ * @see org.objectweb.fractal.api.control.LifeCycleController#startFc()
+ */
+ public void startFc() {
+ getCleared();
+ }
+
+ /* (non-Javadoc)
+ * @see org.objectweb.fractal.api.control.LifeCycleController#stopFc()
+ */
+ public void stopFc() {
+ this.cleared = null;
}
}
Index: gotm/src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java
diff -u gotm/src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java:1.2
gotm/src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java:1.3
--- gotm/src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java:1.2
Fri Feb 4 18:44:33 2005
+++ gotm/src/java/org/objectweb/gotm/lib/event/EventEngineSimple.java Wed
Feb 23 18:39:31 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: EventEngineSimple.java,v 1.2 2005/02/04 17:44:33 rouvoy Exp $
+$Id: EventEngineSimple.java,v 1.3 2005/02/23 17:39:31 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.event;
@@ -41,8 +41,8 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx">Romain Rouvoy</a>
* @created 12 janv. 2005
- * @modified $Date: 2005/02/04 17:44:33 $
- * @version $Revision: 1.2 $
+ * @modified $Date: 2005/02/23 17:39:31 $
+ * @version $Revision: 1.3 $
* @fractal.itf
*/
public class EventEngineSimple
@@ -67,20 +67,19 @@
}
/* (non-Javadoc)
- * @see
org.objectweb.fractal.api.control.CacheController#getLoadState()
+ * @see
org.objectweb.fractal.api.control.CacheController#getCacheState()
*/
public String getCacheState() { return null; }
/* (non-Javadoc)
- * @see org.objectweb.fractal.api.control.CacheController#loadFc()
+ * @see org.objectweb.fractal.api.control.CacheController#initFc()
*/
public void initFc() {
- //System.err.println("FcCache EventEngine");
- //this.topics = new HashMap();
+ // Ignored
}
/* (non-Javadoc)
- * @see org.objectweb.fractal.api.control.CacheController#unloadFc()
+ * @see org.objectweb.fractal.api.control.CacheController#clearFc()
*/
public void clearFc() {
this.topics.clear() ;
@@ -90,7 +89,6 @@
* @see
org.objectweb.gotm.lib.topic.SubscribeFeature#suscribe(java.lang.String,
org.objectweb.gotm.lib.topic.PublishFeature)
*/
public void subscribe(String topic, PublishFeature suscriber) {
- //getTrace().debug("Subscription of "+suscriber+" to the
"+topic+" topic.");
getTopic(topic).add(suscriber);
}
@@ -98,7 +96,6 @@
* @see
org.objectweb.gotm.lib.topic.SubscribeFeature#unsuscribe(java.lang.String,
org.objectweb.gotm.lib.topic.PublishFeature)
*/
public void unsubscribe(String topic, PublishFeature suscriber) {
- //getTrace().debug("Unsubscription of "+suscriber+" from the
"+topic+" topic.");
getTopic(topic).remove(suscriber);
}
@@ -108,7 +105,6 @@
public void notify(String topic, Map context) {
for(Iterator suscribers=getTopic(topic).iterator() ;
suscribers.hasNext() ; ) {
PublishFeature p = (PublishFeature)suscribers.next();
- //getTrace().debug("Notification of the "+topic+" topic to
"+p);
p.notify(topic, context);
}
}
Index: gotm/src/java/org/objectweb/gotm/lib/resource/Resource.java
diff -u gotm/src/java/org/objectweb/gotm/lib/resource/Resource.java:1.1
gotm/src/java/org/objectweb/gotm/lib/resource/Resource.java:1.2
--- gotm/src/java/org/objectweb/gotm/lib/resource/Resource.java:1.1 Fri
Feb 4 18:44:33 2005
+++ gotm/src/java/org/objectweb/gotm/lib/resource/Resource.java Wed Feb 23
18:39:30 2005
@@ -23,15 +23,15 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: Resource.java,v 1.1 2005/02/04 17:44:33 rouvoy Exp $
+$Id: Resource.java,v 1.2 2005/02/23 17:39:30 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.resource;
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx">Romain Rouvoy</a>
* @created 27 janv. 2005
- * @modified $Date: 2005/02/04 17:44:33 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/02/23 17:39:30 $
+ * @version $Revision: 1.2 $
* @fractal.itf name="resource"
*/
public interface Resource {
@@ -40,7 +40,14 @@
public static final String RESOURCE = "resource";
/**
- * @param res
+ * Register the resource.
+ * @param res the resource to register.
*/
public void addResource(Object res);
+
+ /**
+ * Unregister the resource.
+ * @param res the resource to unregister.
+ */
+ public void delResource(Object res);
}
Index: gotm/src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java
diff -u gotm/src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java:1.1
gotm/src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java:1.2
--- gotm/src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java:1.1 Fri
Feb 4 18:44:33 2005
+++ gotm/src/java/org/objectweb/gotm/lib/resource/ResourceImpl.java Wed
Feb 23 18:39:30 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: ResourceImpl.java,v 1.1 2005/02/04 17:44:33 rouvoy Exp $
+$Id: ResourceImpl.java,v 1.2 2005/02/23 17:39:30 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.resource;
@@ -38,8 +38,8 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx">Romain Rouvoy</a>
* @created 1 févr. 2005
- * @modified $Date: 2005/02/04 17:44:33 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/02/23 17:39:30 $
+ * @version $Revision: 1.2 $
* @fractal.itf
*/
public abstract class ResourceImpl
@@ -54,6 +54,13 @@
*/
public void addResource(Object wrapped) {
this.observers.add(wrapped);
+ }
+
+ /* (non-Javadoc)
+ * @see
org.objectweb.gotm.lib.resource.Resource#delResource(java.lang.Object)
+ */
+ public void delResource(Object wrapped) {
+ this.observers.remove(wrapped);
}
protected abstract Runnable configureAction(String topic, Map context,
Object resource);
Index: gotm/src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java:1.1
gotm/src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java:1.2
--- gotm/src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java:1.1
Fri Feb 4 18:44:33 2005
+++ gotm/src/java/org/objectweb/gotm/lib/resource/ResourceWithPool.java Wed
Feb 23 18:39:30 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: ResourceWithPool.java,v 1.1 2005/02/04 17:44:33 rouvoy Exp $
+$Id: ResourceWithPool.java,v 1.2 2005/02/23 17:39:30 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.resource;
@@ -43,8 +43,8 @@
* Implementation of a wrapper.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx">Romain Rouvoy</a>
* @created 22 déc. 2004
- * @modified $Date: 2005/02/04 17:44:33 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/02/23 17:39:30 $
+ * @version $Revision: 1.2 $
* @fractal.itf name="runnable-manager" role="client"
signature="org.objectweb.util.thread.api.RunnableManager"
*/
public abstract class ResourceWithPool
@@ -81,6 +81,13 @@
*/
public void addResource(Object wrapped) {
this.observers.add(wrapped);
+ }
+
+ /* (non-Javadoc)
+ * @see
org.objectweb.gotm.lib.resource.Resource#delResource(java.lang.Object)
+ */
+ public void delResource(Object wrapped) {
+ this.observers.remove(wrapped);
}
protected abstract Runnable configureAction(String topic, Map context,
Object resource);
Index: gotm/src/julia/gotm.cfg
diff -u gotm/src/julia/gotm.cfg:1.1 gotm/src/julia/gotm.cfg:removed
--- gotm/src/julia/gotm.cfg:1.1 Wed Jun 2 10:10:10 2004
+++ gotm/src/julia/gotm.cfg Wed Feb 23 18:39:31 2005
@@ -1,218 +0,0 @@
-###############################################################################
-# CUSTOM CONFIGURATION INFORMATION
-###############################################################################
-
-#
-----------------------------------------------------------------------------
-# INTERFACE CLASS GENERATORS
-#
-----------------------------------------------------------------------------
-
-#
-----------------------------------------------------------------------------
-# CONTROLLER INTERFACES
-#
-# each definition must be of the form (interface-name interface-signature)
-#
-----------------------------------------------------------------------------
-
-#
-----------------------------------------------------------------------------
-# CONTROLLER CLASSES
-#
-# each definition must be a class descriptor
-#
-----------------------------------------------------------------------------
-
-# LifeCycleController implementation (for primitive or composite components)
with implicit logger
-
-(lifecycle-controller-impl
- ((org.objectweb.fractal.julia.asm.MixinClassGenerator
- LifeCycleControllerImpl
- org.objectweb.fractal.julia.BasicControllerMixin
- org.objectweb.fractal.julia.UseComponentMixin
-
org.objectweb.fractal.julia.control.lifecycle.BasicLifeCycleCoordinatorMixin
-
org.objectweb.fractal.julia.control.lifecycle.BasicLifeCycleControllerMixin
- # to check that mandatory client interfaces are bound in startFc:
- org.objectweb.fractal.julia.control.lifecycle.TypeLifeCycleMixin
- # to automatically assign the logger and logger factory:
- org.objectweb.fractal.julia.BasicInitializableMixin
- org.objectweb.fractal.julia.logger.LoggerLifeCycleMixin
- # to notify the encapsulated component (if present) when its state
changes:
- org.objectweb.fractal.julia.control.lifecycle.ContainerLifeCycleMixin
- )
- # optional initialization parameter (monolog configuration file name):
- (monolog-conf-file monolog.properties)
- )
-)
-
-# Factory implementation (for template components)
-
-(template-factory-impl
- ((org.objectweb.fractal.julia.asm.MixinClassGenerator
- FactoryImpl
- org.objectweb.fractal.julia.BasicControllerMixin
- org.objectweb.fractal.julia.UseComponentMixin
- org.objectweb.fractal.julia.factory.BasicTemplateMixin
- # Extension of the BasicTemplateMixin for supporting Templates in the ADL
- org.objectweb.gotm.fractal.lib.FactoryTemplateMixin
- # to copy the template's attributes to the components it creates:
-
org.objectweb.fractal.julia.control.attribute.UseCloneableAttributeControllerMixin
- org.objectweb.fractal.julia.factory.AttributeTemplateMixin
- # to copy the template's name to the components it creates:
- org.objectweb.fractal.julia.control.name.UseNameControllerMixin
- org.objectweb.fractal.julia.factory.NameTemplateMixin
- ))
-)
-
-# Factory implementation (for singleton template components)
-
-(template-singleton-factory-impl
- ((org.objectweb.fractal.julia.asm.MixinClassGenerator
- SingletonFactoryImpl
- org.objectweb.fractal.julia.BasicControllerMixin
- org.objectweb.fractal.julia.UseComponentMixin
- org.objectweb.fractal.julia.factory.BasicTemplateMixin
- # Extension of the BasicTemplateMixin for supporting Templates in the ADL
- org.objectweb.gotm.fractal.lib.FactoryTemplateMixin
- # to copy the template's attributes to the components it creates:
-
org.objectweb.fractal.julia.control.attribute.UseCloneableAttributeControllerMixin
- org.objectweb.fractal.julia.factory.AttributeTemplateMixin
- # to copy the template's name to the components it creates:
- org.objectweb.fractal.julia.control.name.UseNameControllerMixin
- org.objectweb.fractal.julia.factory.NameTemplateMixin
- # to provide the singleton semantics to the template:
- org.objectweb.fractal.julia.factory.SingletonTemplateMixin
- ))
-)
-
-
-#
-----------------------------------------------------------------------------
-# CONTROLLER DESCRIPTORS
-#
-----------------------------------------------------------------------------
-
-(primitiveTemplateFactory
- (
- 'interface-class-generator
- (
- 'component-itf
- 'binding-controller-itf
- 'super-controller-itf
- # only if super-controller-itf does not designate the Julia interface:
- # 'julia-super-controller-itf
- 'name-controller-itf
- 'factory-itf
- # only if factory-itf does not designate the Julia interface:
- # 'julia-factory-itf
- )
- (
- 'component-impl
- 'primitive-binding-controller-impl
- 'super-controller-impl
- 'name-controller-impl
- 'template-factory-impl
- #'factory-impl
- )
- (
- # no interceptors
- )
- org.objectweb.fractal.julia.asm.MergeClassGenerator
- 'optimizationLevel
- )
-)
-
-(parametricPrimitiveTemplateFactory
- (
- 'interface-class-generator
- (
- 'component-itf
- 'julia-attribute-controller-itf
- 'binding-controller-itf
- 'super-controller-itf
- # only if super-controller-itf does not designate the Julia interface:
- # 'julia-super-controller-itf
- 'name-controller-itf
- 'factory-itf
- # only if factory-itf does not designate the Julia interface:
- # 'julia-factory-itf
- )
- (
- 'component-impl
- (org.objectweb.fractal.julia.asm.AttributeControllerClassGenerator
- ('attributeControllerInterface)
- )
- 'primitive-binding-controller-impl
- 'super-controller-impl
- 'name-controller-impl
- 'template-factory-impl
- #'factory-impl
- )
- (
- # no interceptors
- )
- org.objectweb.fractal.julia.asm.MergeClassGenerator
- 'optimizationLevel
- )
-)
-
-(compositeTemplateFactory
- (
- 'interface-class-generator
- (
- 'component-itf
- 'binding-controller-itf
- 'content-controller-itf
- 'super-controller-itf
- # only if super-controller-itf does not designate the Julia interface:
- # 'julia-super-controller-itf
- 'name-controller-itf
- 'factory-itf
- # only if factory-itf does not designate the Julia interface:
- # 'julia-factory-itf
- )
- (
- 'component-impl
- 'composite-binding-controller-impl
- 'content-controller-impl
- 'super-controller-impl
- 'name-controller-impl
- 'template-factory-impl
- #'factory-impl
- )
- (
- # no interceptors
- )
- org.objectweb.fractal.julia.asm.MergeClassGenerator
- 'optimizationLevel
- )
-)
-
-(parametricCompositeTemplateFactory
- (
- 'interface-class-generator
- (
- 'component-itf
- 'julia-attribute-controller-itf
- 'binding-controller-itf
- 'content-controller-itf
- 'super-controller-itf
- # only if super-controller-itf does not designate the Julia interface:
- # 'julia-super-controller-itf
- 'name-controller-itf
- 'factory-itf
- # only if factory-itf does not designate the Julia interface:
- # 'julia-factory-itf
- )
- (
- 'component-impl
- (org.objectweb.fractal.julia.asm.AttributeControllerClassGenerator
- ('attributeControllerInterface)
- )
- 'composite-binding-controller-impl
- 'content-controller-impl
- 'super-controller-impl
- 'name-controller-impl
- 'template-factory-impl
- #'factory-impl
- )
- (
- # no interceptors
- )
- org.objectweb.fractal.julia.asm.MergeClassGenerator
- 'optimizationLevel
- )
-)
Index: gotm/src/monolog/fractal.properties
diff -u /dev/null gotm/src/monolog/fractal.properties:1.1
--- /dev/null Wed Feb 23 18:39:31 2005
+++ gotm/src/monolog/fractal.properties Wed Feb 23 18:39:30 2005
@@ -0,0 +1,59 @@
+# ====================================================================
+#
+# 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:30 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 true
+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
+
+logger.org.objectweb.gotm.handler.0 tty
+logger.org.objectweb.gotm.additivity false
+logger.org.objectweb.gotm.level ERROR
Index: gotm/src/monolog/monolog.properties
diff -u gotm/src/monolog/monolog.properties:1.2
gotm/src/monolog/monolog.properties:removed
--- gotm/src/monolog/monolog.properties:1.2 Fri Jan 14 17:50:04 2005
+++ gotm/src/monolog/monolog.properties Wed Feb 23 18:39:31 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.2 2005/01/14 16:50:04 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 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.gotm.handler.0 tty
-logger.org.objectweb.gotm.additivity false
-logger.org.objectweb.gotm.level ERROR
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.