From 49a88aa41f5883a781ab431f567c11bc11d4aab3 Mon Sep 17 00:00:00 2001 From: Nicolas Dolet Date: Fri, 6 Mar 2009 15:10:37 +0000 Subject: [PATCH] Switch intents version to 0.2-SNAPSHOT. Depend on frascati-debug-0.2-SNAPSHOT in the helloworld-bin/assembly example. Display the SCA interface name in the debug intent. Update AF dependencies: tinfi-0.4.5-SNAPSHOT, juliac-2.1.6-SNAPSHOT. Add Lionel, Damien & Valerio as FraSCAti contributors on the documentation. --- .../examples/helloworld-bin/assembly/pom.xml | 2 +- assembly-factory/pom.xml | 4 +- doc/src/docbkx/frascati-userguide.xml | 49 +++++++++++++++++-- intents/debug/pom.xml | 8 +-- .../intent/debug/DebugIntentHandler.java | 3 ++ intents/pom.xml | 2 +- 6 files changed, 55 insertions(+), 13 deletions(-) diff --git a/assembly-factory/examples/helloworld-bin/assembly/pom.xml b/assembly-factory/examples/helloworld-bin/assembly/pom.xml index f78583bb5..30559e7cf 100644 --- a/assembly-factory/examples/helloworld-bin/assembly/pom.xml +++ b/assembly-factory/examples/helloworld-bin/assembly/pom.xml @@ -54,7 +54,7 @@ org.ow2.frascati.intent frascati-debug - 0.1 + 0.2-SNAPSHOT diff --git a/assembly-factory/pom.xml b/assembly-factory/pom.xml index df0cb555e..f6930c1d1 100644 --- a/assembly-factory/pom.xml +++ b/assembly-factory/pom.xml @@ -270,8 +270,8 @@ - 0.4.4 - 2.1.5 + 0.4.5-SNAPSHOT + 2.1.6-SNAPSHOT 2.5.2 0.5 diff --git a/doc/src/docbkx/frascati-userguide.xml b/doc/src/docbkx/frascati-userguide.xml index 5a890cad6..91b960776 100755 --- a/doc/src/docbkx/frascati-userguide.xml +++ b/doc/src/docbkx/frascati-userguide.xml @@ -8,18 +8,19 @@ v0.5 + - Mr + Pr - Christophe + Lionel - Demarey + Seinturier - INRIA + USTL - + Dr @@ -31,6 +32,44 @@ INRIA + + + Mr + + Damien + + Fournier + + + INRIA + + + + + Mr + + Valerio + + Schiavoni + + + INRIA + + + + + Mr + + Christophe + + Demarey + + + INRIA + + + + Mr diff --git a/intents/debug/pom.xml b/intents/debug/pom.xml index 8e5dce42d..c04ac96a4 100644 --- a/intents/debug/pom.xml +++ b/intents/debug/pom.xml @@ -25,15 +25,15 @@ org.ow2.frascati.intent frascati-debug + 0.2-SNAPSHOT jar Debug intent - 0.1 org.ow2.frascati.intent parent - 0.1 + 0.2-SNAPSHOT @@ -51,7 +51,7 @@ org.ow2.frascati.factory frascati-factory-plugin - 0.5 + 0.6-SNAPSHOT generate-factory @@ -79,7 +79,7 @@ org.ow2.frascati.tinfi frascati-tinfi-runtime - 0.4.4 + 0.4.5-SNAPSHOT diff --git a/intents/debug/src/main/java/org/ow2/frascati/intent/debug/DebugIntentHandler.java b/intents/debug/src/main/java/org/ow2/frascati/intent/debug/DebugIntentHandler.java index cf267e022..7381d3d1e 100644 --- a/intents/debug/src/main/java/org/ow2/frascati/intent/debug/DebugIntentHandler.java +++ b/intents/debug/src/main/java/org/ow2/frascati/intent/debug/DebugIntentHandler.java @@ -52,12 +52,15 @@ public class DebugIntentHandler Component c = ((Interface) ijp.getComponentContext()).getFcItfOwner(); String componentName = Fractal.getNameController(c).getFcName(); String methodDesc = ijp.getMethod().toString(); + String interfaceDesc = ijp.getInterface().getFcItfName(); System.err.println("[FRASCATI-DEBUG] Entering in component '" + componentName + "'"); + System.err.println("[FRASCATI-DEBUG] \t interface: " + interfaceDesc); System.err.println("[FRASCATI-DEBUG] \t method: " + methodDesc); ret = ijp.proceed(); System.err.println("[FRASCATI-DEBUG] Exiting component '" + componentName + "'"); System.err.println("[FRASCATI-DEBUG] \t method: " + methodDesc); + System.err.println("[FRASCATI-DEBUG] \t interface: " + interfaceDesc); return ret; } } diff --git a/intents/pom.xml b/intents/pom.xml index 6ea52b6e4..97ca70e88 100644 --- a/intents/pom.xml +++ b/intents/pom.xml @@ -28,7 +28,7 @@ pom Intent module - 0.1 + 0.2-SNAPSHOT debug -- GitLab