CVS update of gotm (4 files)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Monday, October 31, 2005 @ 13:48:03
  Author: rouvoy
    Path: /cvsroot/gotm/gotm

Modified: .classpath build.xml
          src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java
          
          src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java

* Moving from Julia to AoKell implementation of the Fractal Component Model.


----------------------------------------------------------------------+
 .classpath                                                           |    7 
+--
 build.xml                                                            |   10 
++---
 src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java |   18 
++++++----
 src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java  |   15 
+++++---
 4 files changed, 28 insertions(+), 22 deletions(-)


Index: gotm/.classpath
diff -u gotm/.classpath:1.10 gotm/.classpath:1.11
--- gotm/.classpath:1.10        Mon Jul 11 10:27:05 2005
+++ gotm/.classpath     Mon Oct 31 13:48:03 2005
@@ -4,15 +4,12 @@
        <classpathentry kind="src" path="src/fractal"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="src" path="/ow-transaction"/>
-       <classpathentry kind="lib" 
path="lib/thread-manager/ow_util_thread.jar"/>
-       <classpathentry kind="src" path="/fractal-pool"/>
        <classpathentry kind="lib" 
path="/fractal-import/lib/fractal/fractal.jar"/>
-       <classpathentry kind="lib" 
path="/fractal-import/lib/utils/ow_util_trace.jar"/>
        <classpathentry kind="lib" 
path="/fractal-import/lib/fractal-adl/fractal-adl.jar"/>
        <classpathentry kind="lib" 
path="/fractal-import/lib/monolog/ow_monolog.jar"/>
-       <classpathentry kind="lib" 
path="/fractal-import/lib/julia/julia-mixins.jar"/>
-       <classpathentry kind="lib" 
path="/fractal-import/lib/julia/julia-runtime.jar"/>
        <classpathentry kind="src" path="/fractal-template"/>
        <classpathentry kind="lib" path="lib/howl/howl.jar"/>
+       <classpathentry kind="lib" 
path="/fractal-import/lib/aokell/aokell-lib.jar"/>
+       <classpathentry kind="lib" 
path="lib/thread-manager/ow_util_thread.jar"/>
        <classpathentry kind="output" path="output/eclipse"/>
 </classpath>
Index: gotm/build.xml
diff -u gotm/build.xml:1.7 gotm/build.xml:1.8
--- gotm/build.xml:1.7  Tue Jun 28 10:15:39 2005
+++ gotm/build.xml      Mon Oct 31 13:48:03 2005
@@ -21,7 +21,7 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.7 2005/06/28 08:15:39 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.8 2005/10/31 12:48:03 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="GoTM" default="all">
@@ -81,7 +81,7 @@
   <!-- SUB TARGET DEFINITIONS -->
   <!-- ====================== -->
 
-  <target name="-gotm-prepare" depends="copy-alias,-fractal.pool">
+  <target name="-gotm-prepare" depends="copy-alias,-fractal.template">
     <ant dir="${basedir}/../ow-transaction" target="tx-build"/>
     <copy todir="${build.dir}/${lib.dir}">
       <mapper type="flatten"/>
@@ -89,13 +89,13 @@
     </copy>
   </target>
 
-  <target name="gotm-compile" depends="-gotm-prepare,-fcDoclet">
+  <target name="gotm-compile" depends="-gotm-prepare,-fraclet">
     <mkdir dir="${build.dir}/${class.dir}"/>
     <java.c srcdir="${basedir}/${src.dir}/${java.dir}" />
-    <fcDoclet>
+    <fraclet>
       <fileset dir="${basedir}/../ow-transaction/${src.dir}/${java.dir}" 
           includes="**/*.java"/>
-    </fcDoclet>
+    </fraclet>
   </target>
 
   <target name="gotm-build" depends="gotm-compile,fractal-adl">
Index: 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java:1.2 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java:1.3
--- 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java:1.2 
      Tue Sep  6 10:01:47 2005
+++ gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java 
  Mon Oct 31 13:48:03 2005
@@ -23,20 +23,21 @@
  Contributor(s): .
 
  ---------------------------------------------------------------------
- $Id: TransactionFactoryCache.java,v 1.2 2005/09/06 08:01:47 rouvoy Exp $
+ $Id: TransactionFactoryCache.java,v 1.3 2005/10/31 12:48:03 rouvoy Exp $
  ====================================================================*/
 package org.objectweb.gotm.lib.factory;
 
 import java.util.Stack;
 
 import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.pool.util.FcCache;
+import org.objectweb.fractal.api.NoSuchInterfaceException;
+import org.objectweb.fractal.api.control.CacheController;
 
 /**
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 12 août 2005
- * @modified $Date: 2005/09/06 08:01:47 $
- * @version $Revision: 1.2 $
+ * @modified $Date: 2005/10/31 12:48:03 $
+ * @version $Revision: 1.3 $
  * @fractal.itf
  */
 public class TransactionFactoryCache
@@ -44,6 +45,11 @@
     /** <code>txStack</code> list of recyclable transactions. */
     protected transient Stack txStack = new Stack();
 
+    private CacheController cacheController(Component c)
+            throws NoSuchInterfaceException {
+        return (CacheController) c.getFcInterface("cache-controller");
+    }
+
     /**
      * @param c
      *            component to put back to the stack.
@@ -53,7 +59,7 @@
             getLogger().log(DEBUG,
                     "Storing the component instance into the stack...");
         try {
-            FcCache.getCacheController(c).clearFc();
+            cacheController(c).clearFc();
         } catch (Exception e) {
             if (getLogger().isLoggable(ERROR))
                 getLogger().log(ERROR, e);
@@ -76,7 +82,7 @@
                     "Loading an existing instance of cached component...");
         Component loaded = (Component) this.txStack.pop();
         try {
-            FcCache.getCacheController(loaded).initFc();
+            cacheController(loaded).initFc();
         } catch (Exception e) {
             if (getLogger().isLoggable(ERROR))
                 getLogger().log(ERROR, e);
Index: 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java:1.3 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java:1.4
--- 
gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java:1.3  
      Fri Oct 14 13:43:54 2005
+++ gotm/src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java  
  Mon Oct 31 13:48:03 2005
@@ -23,7 +23,7 @@
 Contributor(s): .
 
 ---------------------------------------------------------------------
-$Id: TransactionFactoryImpl.java,v 1.3 2005/10/14 11:43:54 rouvoy Exp $
+$Id: TransactionFactoryImpl.java,v 1.4 2005/10/31 12:48:03 rouvoy Exp $
 ====================================================================*/
 package org.objectweb.gotm.lib.factory;
 
@@ -42,10 +42,11 @@
 /**
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 12 août 2005
- * @modified $Date: 2005/10/14 11:43:54 $
- * @version $Revision: 1.3 $
+ * @modified $Date: 2005/10/31 12:48:03 $
+ * @version $Revision: 1.4 $
  * @fractal.itf name="tx-model" role="client" contingency="optional" 
signature="org.objectweb.fractal.api.Component"
  * @fractal.itf name="loaded-tx" role="client" 
signature="java.util.Collection"
+ * @fractal.attr name="descriptor" argument="descriptor" 
  */
 public class TransactionFactoryImpl
         extends BindablePrimitive
@@ -53,9 +54,6 @@
     static final String LOADED_TX = "loaded-tx";
     static final String TX_MODEL = "tx-model";
     
-    /** 
-     * @fractal.attr argument="descriptor" 
-     */
     protected String descriptor;
     
     protected final Map txConfiguration = new HashMap(); 
@@ -81,6 +79,11 @@
      */
     protected final Factory txFactory() {
         if (this.txFactory == null) {
+//            System.out.println("--> descriptor="+descriptor);
+//            System.out.println("--> configuration="+txConfiguration);
+//            System.out.println("--> 
communication="+txConfiguration.get("gotm-communication"));
+//            System.out.println("--> 
protocol="+txConfiguration.get("gotm-protocol"));
+//            System.out.println("--> 
template="+txConfiguration.get("template"));
             this.txFactory = (Factory) GotmFactory.create(descriptor, 
txConfiguration, "factory");
         }
         return this.txFactory;