Commit 89a9d50c authored by Philippe Merle's avatar Philippe Merle

WARNING: This is a strongly impacting commits.

Moved to Tinfi 1.4.5-SNAPSHOT and Juliac 2.5-SNAPSHOT.
Thank to Lionel for providing a large part of following patches:
- moved from <groupId>org.objectweb.fractal.juliac...</groupId> to <groupId>org.ow2.fractal.juliac...</groupId> into pom.xml files.
- updated how configuring maven-juliac-plugin into pom.xml files.
- updated Java code to use changes in Tinfi 1.4.5 and Juliac-2.5 code.
- used the new Tinfi feature for configuring SCA properties of type java.lang.Class.
- added content class generation for <implementation.nuxeo> else Tinfi failed to instantiate these components.
- renamed <service name="initializable"> to <service name="InitializableItf"> into
  - frascati/nuxeo/frascati-nuxeo-test/frascati-nuxeo-service-base/src/main/resources/org/ow2/frascati/nuxeo/FraSCAtiInNuxeo.composite
  - frascati/nuxeo/frascati-event-parser/src/main/resources/org/ow2/frascati/assembly/factory/AssemblyFactory.composite
  - frascati/nuxeo/frascati-event-parser/src/main/resources/org/ow2/frascati/parser/event/ParserEvent.composite
  - frascati/nuxeo/frascati-nuxeo-service/src/test/resources/org/ow2/frascati/nuxeo/FraSCAtiInNuxeo.composite
  else Tinfi failed to instantiate these components.
- renamed <service name="initializable"> to <service name="tostart"> into
  - frascati/osgi/frascati-starter/src/test/resources/org/ow2/frascati/FraSCAti.composite
  else Tinfi failed to instantiate these components.

TODO
- frascati/modules/frascati-introspection/frascati-introspection-fscript-impl/src/test/java/org/ow2/frascati/remote/introspection/IntrospectionTest.java
  Issues on deployment of contributions.

TODO related to BPEL support:
- frascati/modules/pom.xml:
  uncomment module frascati-implementation-bpel
- frascati/modules/frascati-all/pom.xml
  uncomment module frascati-implementation-bpel
- examples/pom.xml:
  uncomment BPEL examples.

TODO to OSGi support:
- frascati/osgi/frascati-in-osgi/pom.xml
parent 0b8754ed
......@@ -629,7 +629,7 @@
<dependencies>
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-assembly-factory</artifactId>
<artifactId>frascati-runtime-factory</artifactId>
<version>${frascati.version}</version>
<scope>compile</scope>
</dependency>
......@@ -639,11 +639,12 @@
<!-- Force to compile the SCA composite ${composite.file} because -->
<!-- the FraSCAti compiler is not embedded in the one jar and -->
<!-- then membranes must be generated before execution. -->
<!--
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-compiler-plugin</artifactId>
</plugin>
-->
<!-- Generate one jar with all dependencies inside. -->
<plugin>
<groupId>org.dstovall</groupId>
......@@ -761,7 +762,6 @@
<module>helloworld-widget</module>
<module>helloworld-rest-https</module>
<module>helloworld-scaPrimitiveWithState</module>
<module>calculator</module>
<module>callback</module>
<module>comanche</module>
......@@ -783,13 +783,15 @@
<module>examples-scala</module>
<!-- <module>helloworld-upnp</module> -->
<module>ohloh-proxy</module>
<!-- TODO: Port to Tinfi 1.4.5
<module>bpel-parent</module>
<module>echo-bpel</module>
<module>factorial-bpel</module>
<module>sales-bpel</module>
<module>crisis</module>
<module>nrbc</module>
<module>fibonacci</module>
-->
<module>fibonacci</module>
<!--
<module>picweb</module>
-->
......
......@@ -27,6 +27,8 @@ OW2 FraSCAti 1.5
- Apache CXF 2.5.4
- Eclipse Jetty 7.5.4.v20111024
- OW2 Fractal Binding Factory 0.10-SNAPSHOT
- OW2 Fractal Juliac 2.5-SNAPSHOT
- OW2 FraSCAti Tinfi 1.4.5-SNAPSHOT
- Spring Framework 3.0.5.RELEASE
......
......@@ -23,7 +23,7 @@
*
* Author: Michel Dirix
*
* Contributor(s): Antonio de Almeida Souza Neto
* Contributor(s): Antonio de Almeida Souza Neto , Philippe Merle
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......@@ -50,7 +50,7 @@
<composite.file>easysoa</composite.file>
<!--<service.name>r</service.name> <method.name>run</method.name> -->
<frascati.version>1.5-SNAPSHOT</frascati.version>
<frascati.version>${pom.version}</frascati.version>
<org.ow2.frascati.class>org.ow2.frascati.FraSCAti</org.ow2.frascati.class>
<org.ow2.frascati.bootstrap>org.ow2.frascati.bootstrap.FraSCAti</org.ow2.frascati.bootstrap>
......@@ -68,8 +68,6 @@
<hibernate.connection.password></hibernate.connection.password>
<slf4j.version>1.5.5</slf4j.version>
<juliac.version>2.4.3</juliac.version>
</properties>
......@@ -289,7 +287,7 @@
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-runtime-api</artifactId>
<version>1.4.4</version>
<version>${tinfi.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
......@@ -399,9 +397,6 @@
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
</dependency>
</dependencies>
<!-- ======== -->
......
......@@ -202,12 +202,13 @@
</dependency>
<!-- OW2 FraSCAti SCA Implementation BPEL. -->
<!-- TODO: Porting to Tinfi 1.4.5
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-bpel</artifactId>
<version>${project.version}</version>
</dependency>
-->
<!-- OW2 FraSCAti SCA Implementation Fractal. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
......
......@@ -74,7 +74,7 @@
with OW2 Fractal JuliaC.
-->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
......@@ -84,7 +84,7 @@
<plugins>
<!-- Compile the Fractal architecture of the OW2 FraSCAti assembly factory with JuliaC. -->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
......@@ -86,7 +86,7 @@
with OW2 Fractal JuliaC.
-->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
......@@ -162,7 +162,7 @@ public class ScaComponentPropertyProcessor
return;
}
try {
enclosingCompositePropertyController.setPromoter(propertySource, propertyController, property.getName());
propertyController.setPromoter(property.getName(), enclosingCompositePropertyController, propertySource);
} catch (IllegalPromoterException ipe) {
severe(new ProcessorException(property, "Property '" + property.getName()
+ "' cannot be promoted by the enclosing composite", ipe));
......
......@@ -70,7 +70,7 @@
Compile the SCA composite with OW2 Fractal Juliac and the OW2 FraSCAti Tinfi SCA Parser plugin.
-->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
......@@ -70,7 +70,7 @@
Compile the SCA composite with OW2 Fractal Juliac and the OW2 FraSCAti Tinfi SCA Parser plugin.
-->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- OW2 FraSCAti: Component Factory with Julia Membranes -->
<!-- Copyright (C) 2010-2011 INRIA, University of Lille 1 -->
<!-- Copyright (C) 2010-2012 Inria, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
......@@ -25,13 +25,14 @@
<!-- -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:cf="org/ow2/frascati/component/factory"
xmlns:java="http://frascati.ow2.org/xmlns/java"
name="org.ow2.frascati.component.factory.ComponentFactory">
<component name="julia" constrainingType="cf:FractalBootstrapClassProviderType">
<implementation.java class="org.ow2.frascati.component.factory.impl.MembraneProviderImpl"/>
<property name="membrane-description">OW2 Fractal Julia Membranes</property>
<property name="membrane-names">primitive:composite</property>
<property name="membrane-class">org.ow2.frascati.component.factory.julia.Julia4FraSCAti</property>
<property name="membrane-class" type="java:java.lang.Class">org.ow2.frascati.component.factory.julia.Julia4FraSCAti</property>
</component>
</composite>
......@@ -84,7 +84,7 @@
<!-- Compile the OW2 FraSCAti component factory Juliac SCA composite with OW2 Fractal JuliaC. -->
<!--
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......@@ -111,7 +111,7 @@
<!-- OW2 Fractal Juliac JDK6-based compiler. -->
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>juliac-jdk6</artifactId>
<version>${juliac.version}</version>
</dependency>
......
......@@ -82,7 +82,7 @@
<plugins>
<!-- Compile the OW2 FraSCAti component factory Juliac SCA composite with OW2 Fractal JuliaC. -->
<!-- <plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......@@ -109,7 +109,7 @@
<!-- OW2 Fractal Juliac JDT-based compiler. -->
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>juliac-jdt</artifactId>
<version>${juliac.version}</version>
</dependency>
......
......@@ -83,7 +83,7 @@
<!-- Compile the OW2 FraSCAti component factory Juliac SCA composite with OW2 Fractal JuliaC. -->
<!--
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- OW2 FraSCAti: Component Factory with Juliac Tinfi Object-Oriented Membranes Generator -->
<!-- Copyright (C) 2010-2011 INRIA, University of Lille 1 -->
<!-- Copyright (C) 2010-2012 Inria, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
......@@ -14,7 +14,8 @@
<!-- -->
<!-- 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 -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
......@@ -22,11 +23,14 @@
<!-- -->
<!-- Contributor(s): -->
<!-- -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:juliac="org/ow2/frascati/component/factory/juliac" name="org.ow2.frascati.component.factory.juliac.Juliac">
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:java="http://frascati.ow2.org/xmlns/java"
xmlns:juliac="org/ow2/frascati/component/factory/juliac"
name="org.ow2.frascati.component.factory.juliac.Juliac">
<component constrainingType="juliac:JuliacGeneratorClassProviderType" name="tinfi-oo">
<implementation.java class="org.ow2.frascati.component.factory.impl.MembraneProviderImpl"/>
<property name="membrane-description">OW2 FraSCAti Tinfi Object-Oriented Membranes Juliac Generator</property>
<property name="membrane-names">scaPrimitive:scaComposite:scaContainer</property>
<property name="membrane-class">org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</property>
<property name="membrane-class" type="java:java.lang.Class">org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</property>
</component>
</composite>
\ No newline at end of file
......@@ -82,7 +82,7 @@
<plugins>
<!-- Compile the OW2 FraSCAti component factory Juliac SCA composite with OW2 Fractal JuliaC. -->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......@@ -109,7 +109,7 @@
<!-- OW2 Fractal Juliac compiler. -->
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>juliac-core</artifactId>
<version>${juliac.version}</version>
</dependency>
......
......@@ -27,8 +27,6 @@ package org.ow2.frascati.component.factory.juliac.api;
import org.osoa.sca.annotations.Service;
import org.objectweb.fractal.juliac.conf.Compiler;
/**
* OW2 FraSCAti Component Factory Juliac compiler provider interface.
*
......@@ -41,6 +39,6 @@ public interface JuliacCompilerProvider {
/**
* Get a Juliac compiler.
*/
Compiler getJuliacCompiler();
String getJuliacCompiler();
}
......@@ -25,11 +25,8 @@
package org.ow2.frascati.component.factory.juliac.impl;
import org.objectweb.fractal.juliac.conf.Compiler;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.component.factory.juliac.api.JuliacCompilerProvider;
import org.ow2.frascati.util.AbstractLoggeable;
......@@ -65,9 +62,9 @@ public class JuliacCompilerProviderImpl
/**
* @see JuliacCompilerProvider#getJuliacCompiler()
*/
public Compiler getJuliacCompiler()
public String getJuliacCompiler()
{
return Compiler.valueOf(this.juliacCompiler);
return this.juliacCompiler;
}
}
......@@ -20,7 +20,7 @@
*
* Author: Damien Fournier
*
* Contributor(s): Philippe Merle
* Contributor(s): Philippe Merle, Lionel Seinturier
*
*/
......@@ -37,19 +37,16 @@ import org.objectweb.fractal.fraclet.types.Constants;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.conf.JDKLevel;
import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.objectweb.fractal.juliac.conf.JulietLoader;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.component.factory.api.FactoryException;
import org.ow2.frascati.component.factory.api.MembraneGeneration;
import org.ow2.frascati.component.factory.api.MembraneProvider;
import org.ow2.frascati.component.factory.juliac.api.JuliacCompilerProvider;
import org.ow2.frascati.util.AbstractLoggeable;
import org.ow2.frascati.util.FrascatiClassLoader;
import org.ow2.frascati.util.FrascatiException;
/**
* OW2 FraSCAti Component Factory Juliac component class.
......@@ -180,30 +177,32 @@ public class JuliacComponent
jcfg.setSourceLevel(JDKLevel.JDK1_5);
jcfg.setTargetLevel(JDKLevel.JDK1_5);
if(this.juliacCompilerProvider != null) {
jcfg.setCompiler(juliacCompilerProvider.getJuliacCompiler());
}
StringBuilder juliacOptLevel = new StringBuilder();
for(MembraneProvider jgc : juliacGeneratorClassProviders) {
juliacOptLevel.append(':');
juliacOptLevel.append(jgc.getMembraneClass().getCanonicalName());
}
jcfg.setOptLevel(juliacOptLevel.substring(1)); // remove first ':'
// use the current thread's context class loader where FraSCAti is loaded
// to load Juliac plugins instead of the class loader where Juliac was loaded.
// jcfg.setClassLoader(FrascatiClassLoader.getCurrentThreadContextClassLoader());
jcfg.setClassLoader(frascatiClassLoader);
try {
jcfg.loadOptLevels();
} catch(Exception e) {
severe(new FactoryException("Problem when loading Juliac option levels", e));
return;
if(this.juliacCompilerProvider != null) {
String compiler = juliacCompilerProvider.getJuliacCompiler();
try {
jcfg.loadModule(compiler);
}
catch( IOException ioe ) {
throw new FactoryException(ioe);
}
}
for(MembraneProvider jgc : juliacGeneratorClassProviders) {
String name = jgc.getMembraneClass().getCanonicalName();
try {
jcfg.loadModule(name);
}
catch( IOException ioe ) {
throw new FactoryException(ioe);
}
}
if(this.outputDir == null) {
File f;
try {
......@@ -343,9 +342,7 @@ public class JuliacComponent
// Generate all the membranes to generate.
for(MembraneDescription md : membranesToGenerate) {
try {
String membraneDesc = md.membraneDesc;
if("scaPrimitive".equals(membraneDesc) && md.contentDesc instanceof String) {
if("scaPrimitive".equals(md.membraneDesc) && md.contentDesc instanceof String) {
String className = (String)md.contentDesc;
Class<?> clazz = null;
try {
......@@ -364,15 +361,18 @@ public class JuliacComponent
membrane = clazz.getAnnotation(Membrane.class);
// Add to Juliac a binding between the membrane name and the membrane class
// else Juliac could not know the membrane class.
jcfg.getJulietLoader().put(membrane.desc(), clazz);
JulietLoader mloader =
jcfg.loadModuleIfNew(
JulietLoader.class.getName(), JulietLoader.class );
mloader.put(membrane.desc(), clazz);
}
// Change the membraneDesc to use to instantiate the component.
membraneDesc = membrane.desc();
md.membraneDesc = membrane.desc();
}
}
jc.getFCSourceCodeGenerator(md.membraneDesc)
.generate(md.componentType, membraneDesc, md.contentDesc);
.generate(md.componentType, md.membraneDesc, md.contentDesc);
} catch (Exception e) {
severe(new FactoryException("Cannot generate component code with Juliac", e));
return;
......
......@@ -83,7 +83,7 @@
<!-- Compile the OW2 FraSCAti component factory Tinfi SCA composite with OW2 Fractal JuliaC. -->
<!--
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- OW2 FraSCAti: Component Factory with Tinfi Object-Oriented Membranes -->
<!-- Copyright (C) 2010-2011 INRIA, University of Lille 1 -->
<!-- Copyright (C) 2010-2012 Inria, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
......@@ -14,7 +14,8 @@
<!-- -->
<!-- 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 -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
......@@ -22,11 +23,14 @@
<!-- -->
<!-- Contributor(s): -->
<!-- -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:cf="org/ow2/frascati/component/factory" name="org.ow2.frascati.component.factory.ComponentFactory">
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:java="http://frascati.ow2.org/xmlns/java"
xmlns:cf="org/ow2/frascati/component/factory"
name="org.ow2.frascati.component.factory.ComponentFactory">
<component constrainingType="cf:FractalBootstrapClassProviderType" name="tinfi-oo">
<implementation.java class="org.ow2.frascati.component.factory.impl.MembraneProviderImpl"/>
<property name="membrane-description">OW2 FraSCAti Tinfi Object-Oriented Membranes</property>
<property name="membrane-names">scaPrimitive:scaComposite:scaContainer</property>
<property name="membrane-class">org.objectweb.fractal.juliac.runtime.Juliac</property>
<property name="membrane-class" type="java:java.lang.Class">org.objectweb.fractal.juliac.runtime.Juliac</property>
</component>
</composite>
\ No newline at end of file
......@@ -82,7 +82,7 @@
<plugins>
<!-- Compile the OW2 FraSCAti component factory SCA composite with OW2 Fractal JuliaC. -->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
......
......@@ -64,9 +64,7 @@ public class MembraneProviderImpl
* Property for membrane class.
*/
@Property(name = "membrane-class")
private String membraneClass;
// TODO: Should be of type Class but the Tinfi SCA Parser only manages type String.
// private Class membraneClass;
private Class<?> membraneClass;
//---------------------------------------------------------------------------
// Internal methods.
......@@ -97,11 +95,6 @@ public class MembraneProviderImpl
*/
public Class<?> getMembraneClass()
{
// TODO: Don't use current thread's context class loader.
try {
return org.ow2.frascati.util.FrascatiClassLoader.getCurrentThreadContextClassLoader().loadClass(this.membraneClass);
} catch(ClassNotFoundException cnfe) {
throw new Error(cnfe);
}
return this.membraneClass;
}
}
......@@ -76,7 +76,7 @@
<plugins>
<!-- Compiling components extending EasyVIPER. -->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<groupId>org.ow2.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<version>${juliac.version}</version>
<executions>
......@@ -92,13 +92,13 @@
<srcs>
<src>src/main/java</src>
</srcs>
<adlParsers>
<adlParser>org.ow2.frascati.tinfi.tinfilet.TinfiParserSupportImpl</adlParser>
</adlParsers>
<opts>
<opt>com.ebmwebsourcing.easycommons.sca.helper.impl.SCAEasy</opt>
<opt>OO</opt>
</opts>
<modules>
<module>JDT</module>
<module>SPOON</module>
<module>org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</module>
<module>com.ebmwebsourcing.easycommons.sca.helper.impl.SCAEasy</module>
<module>org.ow2.frascati.tinfi.tinfilet.TinfiParserSupportImpl</module>
</modules>
<mixins>
<mixin>
org.ow2.frascati.tinfi:frascati-tinfi-mixins:${tinfi.version}:sources
......@@ -111,11 +111,9 @@
<adl>org.ow2.frascati.implementation.bpel.easybpel.EasyBpelReceiverImpl</adl>
<adl>org.ow2.frascati.implementation.bpel.easybpel.EasyBpelSenderImpl</adl>
</adls>
<modules>
<module>org.ow2.frascati.tinfi:frascati-tinfi-oo:${tinfi.version}</module>
<module>org.objectweb.fractal.juliac:juliac-jdt:${juliac.version}</module>
<module>org.objectweb.fractal.juliac:juliac-spoon:${juliac.version}</module>
</modules>
<artifacts>
<artifact>org.ow2.frascati.tinfi:frascati-tinfi-oo:${tinfi.version}</artifact>
</artifacts>
<compileGenerated>false</compileGenerated>
<!--
<debug>true</debug>
......@@ -206,8 +204,24 @@
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-membranes-oo</artifactId>
</exclusion>
<!-- Temporarily exclude this easycommons-sca-impl while the -->
<!-- released module still depends on a version of Tinfi that is not -->
<!-- 1.4.5. Once this will be the case this exclusion can be removed -->
<!-- as well as the dependency towards to the replacement module -->
<!-- below. -->
<exclusion>
<groupId>com.ebmwebsourcing.easycommons</groupId>
<artifactId>easycommons-sca-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Replacement module for easycommons-sca-impl. -->
<dependency>
<groupId>org.ow2.frascati.tinfi.easycommons</groupId>
<artifactId>frascati-tinfi-easycommons-sca-impl</artifactId>
<version>${tinfi.version}</version>
</dependency>
<!-- EasyViper component membranes require Monolog. -->
<dependency>
......
......@@ -20,7 +20,7 @@
*
* Author: Philippe Merle
*
* Contributor(s):
* Contributor(s): Lionel Seinturier
*
*/
......@@ -310,4 +310,10 @@ public abstract class AbstractFrascatiContainer
return false;
}
/**
* @see SCAPropertyController#removePromoter(String)
*/
public void removePromoter( String name ) {
log.finest("removePromoter(\"" + name + "\") called");
}
}
......@@ -27,6 +27,15 @@
package org.ow2.frascati.implementation.bpel.easybpel;
import java.net.URI;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.implementation.bpel.api.BPELEngine;
import org.ow2.frascati.implementation.bpel.api.BPELProcess;
import org.ow2.frascati.util.AbstractLoggeable;
import org.ow2.frascati.util.FrascatiException;
import com.ebmwebsourcing.easybpel.model.bpel.api.BPELException;
import com.ebmwebsourcing.easybpel.model.bpel.api.BPELFactory;
import com.ebmwebsourcing.easybpel.model.bpel.api.inout.BPELReader;
......@@ -34,21 +43,10 @@ import com.ebmwebsourcing.easybpel.model.bpel.impl.BPELFactoryImpl;
import com.ebmwebsourcing.easybpel.model.bpel.impl.message.BPELExternalMessageImpl;
import com.ebmwebsourcing.easybpel.model.bpel.impl.message.BPELInternalMessageImpl;
import com.ebmwebsourcing.easybpel.model.bpel.impl.message.DefaultBPELMessageConverter;
import com.ebmwebsourcing.easyviper.core.api.Core;
import com.ebmwebsourcing.easyviper.core.api.engine.configuration.ConfigurationEngine;
import com.ebmwebsourcing.easyviper.core.impl.engine.configuration.ConfigurationEngineImpl;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Property;
import org.ow2.frascati.implementation.bpel.api.BPELEngine;
import org.ow2.frascati.implementation.bpel.api.BPELProcess;
import org.ow2.frascati.util.AbstractLoggeable;
import org.ow2.frascati.util.FrascatiClassLoader;
import org.ow2.frascati.util.FrascatiException;