Commit 714eae68 authored by Lionel Seinturier's avatar Lionel Seinturier

Moving to Tinfi 1.4.1 and Juliac 2.2.6.

parent a853903b
......@@ -15,8 +15,8 @@ OW2 FraSCAti 1.4
* Added preliminary support for <sca:binding.jms> built on top of OW2 JORAM. See:
- /trunk/frascati/modules/frascati-binding-jms/
* Moved to OW2 FraSCAti Tinfi 1.4,
OW2 Fractal Juliac 2.2.5.1,
* Moved to OW2 FraSCAti Tinfi 1.4.1,
OW2 Fractal Juliac 2.2.6,
OW2 Fractal Binding Factory 0.9-SNAPSHOT,
Apache CXF 2.3.0,
Spring Framework 3.0.4.
......
......@@ -30,8 +30,8 @@ import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
import org.osoa.sca.ServiceUnavailableException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
@Service(IntentHandler.class)
......
......@@ -38,8 +38,8 @@ import org.objectweb.fractal.util.Fractal;
import org.objectweb.util.explorer.api.DropAction;
import org.objectweb.util.explorer.api.DropTreeView;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* This class provides the ability dynamically add an intent
......
......@@ -40,8 +40,8 @@ import org.objectweb.fractal.util.Fractal;
import org.objectweb.util.explorer.api.MenuItemTreeView;
import org.ow2.frascati.explorer.context.IntentWrapper;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* This class provides the ability dynamically remove an intent
......
......@@ -38,7 +38,7 @@ import org.objectweb.fractal.explorer.context.ClientInterfaceWrapper;
import org.objectweb.fractal.explorer.context.ComponentContextForService;
import org.objectweb.util.explorer.api.Entry;
import org.objectweb.util.explorer.core.naming.lib.DefaultEntry;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
/**
* Component context for user role.
......@@ -48,6 +48,9 @@ import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
public class ComponentContext
extends ComponentContextForService
{
final public static String SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME = "sca-component-controller";
// ==================================================================
//
// Internal state.
......@@ -127,7 +130,7 @@ public class ComponentContext
for (Component c : components) {
try {
c.getFcInterface(org.ow2.frascati.tinfi.control.component.ReconfigurableComponentContext.NAME);
c.getFcInterface(SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME);
additionalEntries.add( new DefaultEntry(FcExplorer.getName(c), c) );
} catch (NoSuchInterfaceException e) {
/* The sca-component-controller cannot be found!
......
......@@ -50,9 +50,9 @@ import org.objectweb.fractal.util.Fractal;
import org.objectweb.util.explorer.api.Context;
import org.objectweb.util.explorer.api.Entry;
import org.objectweb.util.explorer.core.naming.lib.DefaultEntry;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.control.intent.SCAIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.control.SCAIntentController;
/**
* SCA interface context used to add SCA entries as childs of this node.
......
......@@ -37,9 +37,10 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.ContentController;
import org.objectweb.fractal.explorer.FcExplorer;
import org.objectweb.util.explorer.api.TreeView;
import org.ow2.frascati.explorer.context.ComponentContext;
import org.ow2.frascati.explorer.icon.ComponentIconProvider;
import org.ow2.frascati.tinfi.control.content.ContentInstantiationException;
import org.ow2.frascati.tinfi.control.content.SCAContentController;
import org.ow2.frascati.tinfi.api.control.ContentInstantiationException;
import org.ow2.frascati.tinfi.api.control.SCAContentController;
public class ComponentContentTable
extends AbstractSelectionPanel<Component>
......@@ -101,7 +102,7 @@ public class ComponentContentTable
for (Component c : components) {
try {
c.getFcInterface(org.ow2.frascati.tinfi.control.component.ReconfigurableComponentContext.NAME);
c.getFcInterface(ComponentContext.SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME);
Icon icon = (Icon) ComponentIconProvider.getInstance().newIcon( getSelection() );
JLabel compLabel = new JLabel(FcExplorer.getName(c));
......
......@@ -35,7 +35,7 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.util.explorer.api.Table;
import org.objectweb.util.explorer.api.TreeView;
import org.objectweb.util.explorer.core.naming.lib.DefaultEntry;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
public class ComponentPropertyTable
implements Table
......
......@@ -41,11 +41,10 @@ import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.control.LifeCycleController;
import org.objectweb.fractal.util.Fractal;
import org.objectweb.util.explorer.api.TreeView;
import org.ow2.frascati.assembly.factory.api.ClassLoaderManager;
import org.ow2.frascati.assembly.factory.processor.ScaPropertyTypeJavaProcessor;
import org.ow2.frascati.explorer.api.FraSCAtiExplorer;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
public class PropertyPanel
extends AbstractSelectionPanel<SCAPropertyController>
......
......@@ -25,23 +25,21 @@
package org.ow2.frascati.assembly.factory.processor;
import java.lang.annotation.ElementType;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.stp.sca.BaseReference;
import org.eclipse.stp.sca.Multiplicity;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.api.type.TypeFactory;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.component.factory.api.FactoryException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* OW2 FraSCAti Assembly Factory base reference intent processor abstract class.
......
......@@ -25,19 +25,18 @@
package org.ow2.frascati.assembly.factory.processor;
import org.eclipse.stp.sca.BaseService;
import java.lang.annotation.ElementType;
import org.eclipse.stp.sca.BaseService;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.api.type.TypeFactory;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.component.factory.api.FactoryException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* OW2 FraSCAti Assembly Factory base service intent processor abstract class.
......
......@@ -26,27 +26,25 @@
package org.ow2.frascati.assembly.factory.processor;
import java.lang.annotation.ElementType;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.stp.sca.BaseReference;
import org.eclipse.stp.sca.BaseService;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.control.IllegalLifeCycleException;
import org.objectweb.fractal.api.type.ComponentType;
import org.objectweb.fractal.api.type.InterfaceType;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.component.factory.api.FactoryException;
import org.ow2.frascati.component.factory.api.TypeFactory;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* OW2 FraSCAti Assembly Factory SCA component processor implementation.
......
......@@ -26,20 +26,18 @@
package org.ow2.frascati.assembly.factory.processor;
import java.util.List;
import javax.xml.namespace.QName;
import org.eclipse.emf.ecore.EObject;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ManagerException;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* OW2 FraSCAti Assembly Factory intent processor abstract class.
......
......@@ -30,16 +30,13 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.eclipse.stp.sca.SCAPropertyBase;
import org.osoa.sca.annotations.Reference;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
/**
* OW2 FraSCAti Assembly Factory abstract property processor class.
......
......@@ -25,20 +25,20 @@
package org.ow2.frascati.assembly.factory.processor;
import java.lang.annotation.ElementType;
import javax.xml.namespace.QName;
import org.eclipse.stp.sca.Composite;
import org.eclipse.stp.sca.Property;
import org.eclipse.stp.sca.PropertyValue;
import org.eclipse.stp.sca.ScaPackage;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.control.property.IllegalPromoterException;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.tinfi.api.control.IllegalPromoterException;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
/**
* OW2 FraSCAti Assembly Factory SCA component property processor class.
......
......@@ -28,10 +28,9 @@ import javax.script.ScriptEngine;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.LifeCycleController;
import org.objectweb.fractal.api.control.IllegalLifeCycleException;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.objectweb.fractal.api.control.LifeCycleController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
import org.ow2.frascati.util.AbstractLoggeable;
/**
......
......@@ -119,7 +119,7 @@ public class FrascatiTinfiScaParser
*/
@Override
@SuppressWarnings("unchecked")
public final <T> T parse( String adl ) throws IOException
public final <T> T parse( String adl, Object context ) throws IOException
{
try {
Parser<Composite> compositeParser = getCompositeParser();
......
......@@ -25,6 +25,13 @@
*/
package org.ow2.frascati.fscript.model;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.objectweb.fractal.adl.util.ContentControllerHelper;
import org.objectweb.fractal.adl.util.NoSuchComponentException;
import org.objectweb.fractal.api.Component;
......@@ -39,14 +46,6 @@ import org.objectweb.fractal.fscript.model.fractal.InterfaceNode;
import org.objectweb.fractal.fscript.types.UnionType;
import org.objectweb.fractal.util.BindingControllerHelper;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.tinfi.control.component.ReconfigurableComponentContext;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* Implements the <code>scabinding</code> axis in FPath. This axis connects client
......@@ -59,6 +58,9 @@ import java.util.logging.Logger;
public class ScaBindingAxis
extends AbstractAxis
{
final static String SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME = "sca-component-controller";
/** The logger */
private static Logger logger = Logger.getLogger("org.ow2.frascati.fscript.model.ScaBindingAxis");
......@@ -144,7 +146,7 @@ public class ScaBindingAxis
Component clientItfOwner = clientItf.getFcItfOwner();
try {
clientItfOwner.getFcInterface(ReconfigurableComponentContext.NAME);
clientItfOwner.getFcInterface(SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME);
// Nothing to do : we don't want to display wires
} catch (NoSuchInterfaceException e) {
// Not an SCA component => it's a binding component
......
......@@ -73,7 +73,7 @@ public class ScaChildAxis
Set<Node> result = new HashSet<Node>();
for (Component child : cc.getFcSubComponents()) {
try {
child.getFcInterface(org.ow2.frascati.tinfi.control.component.ReconfigurableComponentContext.NAME);
child.getFcInterface(ScaBindingAxis.SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME);
ComponentNode node = ((NodeFactory) model).createScaComponentNode(child);
result.add(node);
} catch (NoSuchInterfaceException e) {
......
......@@ -44,8 +44,8 @@ import org.objectweb.fractal.fscript.model.fractal.InterfaceNode;
import org.objectweb.fractal.fscript.types.UnionType;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* Implements the <code>scaintent</code> axis in FPath. This axis connects SCA
......
......@@ -29,7 +29,7 @@ package org.ow2.frascati.fscript.model;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.fscript.model.fractal.ComponentNode;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
/**
* A {@link Node} which represents an SCA intent.
......
......@@ -94,7 +94,7 @@ public class ScaParentAxis
Set<Node> result = new HashSet<Node>();
for (Component parent : cc.getFcSuperComponents()) {
try {
parent.getFcInterface(org.ow2.frascati.tinfi.control.component.ReconfigurableComponentContext.NAME);
parent.getFcInterface(ScaBindingAxis.SCA_COMPONENT_CONTEXT_CTRL_ITF_NAME);
ScaComponentNode node = ((NodeFactory) model).createScaComponentNode(parent);
// Check that parent is not an hidden frascati container
if (compName != null) {
......
......@@ -36,7 +36,7 @@ import org.objectweb.fractal.fscript.model.fractal.ComponentNode;
import org.objectweb.fractal.fscript.model.fractal.InterfaceNode;
import org.objectweb.fractal.fscript.types.UnionType;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
/**
* Implements the <code>scaproperty</code> axis in FPath. This axis connects a component
......
......@@ -34,7 +34,7 @@ import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.fscript.model.AbstractNode;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
/**
* A {@link Node} which represents a SCA property.
......
......@@ -37,4 +37,12 @@
<version>1.4-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.eclipse.stp.sca.osoa.java</groupId>
<artifactId>osoa-java-api</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</project>
......@@ -27,8 +27,8 @@ import org.objectweb.fractal.api.Component;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.intent.bench.api.Report;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
/**
* {@link IntentHandler} implementation for a simple bench
......@@ -56,7 +56,7 @@ public class BenchIntentHandler
public Object invoke(IntentJoinPoint ijp) throws Throwable {
Object ret;
Component c = ijp.getComponentContext().getFcComponent();
Component c = ijp.getComponent();
// Get time before proceed
long before = System.currentTimeMillis();
......
......@@ -25,7 +25,7 @@
<component name="benchIntentHandler">
<implementation.java class="org.ow2.frascati.intent.bench.BenchIntentHandler"/>
<service name="bench">
<interface.java interface="org.ow2.frascati.tinfi.control.intent.IntentHandler"/>
<interface.java interface="org.ow2.frascati.tinfi.api.IntentHandler"/>
</service>
<reference name="report" target="statistics/report"/>
</component>
......
......@@ -36,5 +36,13 @@
<artifactId>parent</artifactId>
<version>1.4-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.eclipse.stp.sca.osoa.java</groupId>
<artifactId>osoa-java-api</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</project>
......@@ -30,12 +30,10 @@ package org.ow2.frascati.intent.debug;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.util.Fractal;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Property;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
/**
* {@link IntentHandler} implementation for a simple debug.
......@@ -66,7 +64,7 @@ public class DebugIntentHandler
// Obtain reflective information on the current invocation.
//
// The invoked component.
Component c = ijp.getComponentContext().getFcComponent();
Component c = ijp.getComponent();
// Its component name.
String componentName = Fractal.getNameController(c).getFcName();
// The invoked method.
......
......@@ -22,12 +22,12 @@
<!-- -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:di="http://debug-intent" name="frascati-debug">
<service name="intent" promote="debug-intent-handler/intent">
<interface.java interface="org.ow2.frascati.tinfi.control.intent.IntentHandler"/>
<interface.java interface="org.ow2.frascati.tinfi.api.IntentHandler"/>
</service>
<component name="debug-intent-handler">
<implementation.java class="org.ow2.frascati.intent.debug.DebugIntentHandler"/>
<service name="intent">
<interface.java interface="org.ow2.frascati.tinfi.control.intent.IntentHandler"/>
<interface.java interface="org.ow2.frascati.tinfi.api.IntentHandler"/>
</service>
<property name="header">[FRASCATI-DEBUG]</property>
</component>
......
......@@ -306,9 +306,9 @@
<properties>
<org.eclipse.stp.sca.version>2.0.1.2</org.eclipse.stp.sca.version>
<tinfi.version>1.4</tinfi.version>
<tinfi.version>1.4.1</tinfi.version>
<julia.version>2.5.2</julia.version>
<juliac.version>2.2.5.1</juliac.version>
<juliac.version>2.2.6</juliac.version>
<fractal-adl.version>2.3.1</fractal-adl.version>
<fractal-util.version>1.1.2</fractal-util.version>
<fractal-bf.version>0.9-SNAPSHOT</fractal-bf.version>
......
......@@ -130,6 +130,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.osoa.java</groupId>
<artifactId>osoa-java-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
......
......@@ -27,8 +27,8 @@ import javax.transaction.TransactionManager;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentHandler;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public abstract class AbstractTransactionIntentHandler
......
......@@ -24,7 +24,7 @@
package org.ow2.frascati.transaction.intent.handler;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class ImmediateOneWayIntentHandler
......
......@@ -26,7 +26,7 @@ package org.ow2.frascati.transaction.intent.handler;
import javax.transaction.Status;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class ManagedTransactionGlobalIntentHandler
......
......@@ -27,7 +27,7 @@ import javax.transaction.Status;
import javax.transaction.Transaction;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class ManagedTransactionLocalIntentHandler
......
......@@ -28,7 +28,7 @@ import javax.transaction.Status;
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.util.Fractal;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class NoManagedTransactionIntentHandler
......@@ -45,7 +45,7 @@ public class NoManagedTransactionIntentHandler
// Check that the joinpoint will be proceeded outside of the scope of
// a transaction. If not, this intent handler throws an Error
String componentName = Fractal.getNameController(
((Interface) ijp.getComponentContext()).getFcItfOwner()).getFcName();
((Interface) ijp.getComponent()).getFcItfOwner()).getFcName();
if (transactionManager.getStatus() != Status.STATUS_NO_TRANSACTION)
throw new Error("Component " + componentName + " must be executed out of"
+ "the scope of a transaction");
......
......@@ -24,7 +24,7 @@
package org.ow2.frascati.transaction.intent.handler;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class PropagatesTransactionIntentHandler
......
......@@ -26,7 +26,7 @@ package org.ow2.frascati.transaction.intent.handler;
import javax.transaction.Transaction;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class SuspendsTransactionIntentHandler
......
......@@ -24,7 +24,7 @@
package org.ow2.frascati.transaction.intent.handler;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.tinfi.control.intent.IntentJoinPoint;
import org.ow2.frascati.tinfi.api.IntentJoinPoint;
@Scope("COMPOSITE")
public class TransactedOneWayIntentHandler
......
......@@ -23,12 +23,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="immediateOneWay">
<service name="intent" promote="transactionIntentManager/immediateOneWay">
<interface.java interface="org.ow2.frascati.tinfi.control.intent.IntentHandler"/>
<interface.java interface="org.ow2.frascati.tinfi.api.IntentHandler"/>
</service>
<component name="transactionIntentManager">
<service name="immediateOneWay">
<interface.java interface="org.ow2.frascati.tinfi.control.intent.IntentHandler"/>
<interface.java interface="org.ow2.frascati.tinfi.api.IntentHandler"/>
</service>
<implementation.composite name="transactionIntentManager.composite" />
</component>
......
......@@ -23,12 +23,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="managedTransaction.global">
<service name="intent" promote="transactionIntentManager/managedTransactionGlobal">
<interface.java interface="org.ow2.frascati.tinfi.control.intent.IntentHandler"/>