Commit 4675a624 authored by Lionel Seinturier's avatar Lionel Seinturier
Browse files

Remove inheritance from the Light and the regular membrane definitions.

Sort controller definitions and use separator comments.
parent 9d14200b
......@@ -23,6 +23,7 @@
package org.ow2.frascati.tinfi.membrane;
import org.oasisopen.sca.ComponentContext;
import org.objectweb.fractal.fraclet.extensions.Controller;
import org.objectweb.fractal.fraclet.extensions.Membrane;
import org.objectweb.fractal.julia.BasicControllerMixin;
......@@ -30,8 +31,15 @@ import org.objectweb.fractal.julia.UseComponentMixin;
import org.objectweb.fractal.julia.control.lifecycle.UseLifeCycleControllerMixin;
import org.objectweb.fractal.julia.control.name.UseNameControllerMixin;
import org.ow2.frascati.tinfi.api.control.SCABasicIntentController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
import org.ow2.frascati.tinfi.control.component.ComponentContextMixin;
import org.ow2.frascati.tinfi.control.content.UseSCAContentControllerMixin;
import org.ow2.frascati.tinfi.control.intent.LifeCycleIntentMixin;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentControllerMixin;
import org.ow2.frascati.tinfi.control.property.SCACompositePropertyControllerMixin;
import org.ow2.frascati.tinfi.control.property.SCAPropertyControllerMixin;
import org.ow2.frascati.tinfi.control.property.SCAPropertyPromoterMixin;
import org.ow2.frascati.tinfi.control.property.UseSCAPropertyControllerMixin;
import org.ow2.frascati.tinfi.opt.oo.InterceptorClassGenerator;
import org.ow2.frascati.tinfi.opt.oo.SCAIntentInterceptorSourceCodeGenerator;
import org.ow2.frascati.tinfi.opt.oo.SCATinfiInterceptorSourceCodeGenerator;
......@@ -48,10 +56,32 @@ import org.ow2.frascati.tinfi.opt.oo.SCATinfiInterceptorSourceCodeGenerator;
interceptors={
SCATinfiInterceptorSourceCodeGenerator.class,
SCAIntentInterceptorSourceCodeGenerator.class})
public class SCAComposite extends SCALightComposite {
public class SCAComposite extends Composite {
final public static String NAME = "scaComposite";
@Controller(
name="sca-component-controller",
impl="SCAComponentControllerImpl",
mixins={
BasicControllerMixin.class,
UseComponentMixin.class,
UseSCAContentControllerMixin.class,
UseSCAPropertyControllerMixin.class,
ComponentContextMixin.class})
protected ComponentContext compctx;
@Controller(
name="sca-property-controller",
impl="SCACompositePropertyControllerImpl",
mixins={
BasicControllerMixin.class,
UseNameControllerMixin.class,
SCACompositePropertyControllerMixin.class,
SCAPropertyControllerMixin.class,
SCAPropertyPromoterMixin.class})
protected SCAPropertyController scapc;
@Controller(
name="sca-intent-controller",
impl="SCACompositeIntentControllerImpl",
......
......@@ -76,16 +76,9 @@ public class SCALightPrimitive extends Primitive {
final public static String NAME = "scaPrimitive";
@Controller(
name="sca-component-controller",
impl="SCAComponentControllerImpl",
mixins={
BasicControllerMixin.class,
UseComponentMixin.class,
UseSCAContentControllerMixin.class,
UseSCAPropertyControllerMixin.class,
ComponentContextMixin.class})
protected ComponentContext compctx;
// ---------------------------------------------------------
// Redefining Julia controllers
// ---------------------------------------------------------
@Controller(
name="binding-controller",
......@@ -117,19 +110,21 @@ public class SCALightPrimitive extends Primitive {
SCALifeCycleMixin.class})
protected LifeCycleCoordinator lc;
// ---------------------------------------------------------
// Tinfi controllers
// ---------------------------------------------------------
@Controller(
name="/sca-content-controller",
impl="SCAContentControllerImpl",
name="sca-component-controller",
impl="SCAComponentControllerImpl",
mixins={
BasicControllerMixin.class,
RequestContextSCAContentMixin.class,
UseComponentMixin.class,
UseSCAContentControllerMixin.class,
UseSCAPropertyControllerMixin.class,
SCALightContentControllerMixin.class,
UseLifeCycleControllerMixin.class,
LifeCycleSCAContentMixin.class})
protected SCAExtendedContentController scacc;
ComponentContextMixin.class})
protected ComponentContext compctx;
@Controller(
name="sca-property-controller",
impl="SCAPrimitivePropertyControllerImpl",
......@@ -141,4 +136,21 @@ public class SCALightPrimitive extends Primitive {
SCAPropertyControllerMixin.class,
SCAPropertyPromoterMixin.class})
protected SCAPropertyController scapc;
// ---------------------------------------------------------
// Tinfi hidden controllers
// ---------------------------------------------------------
@Controller(
name="/sca-content-controller",
impl="SCAContentControllerImpl",
mixins={
BasicControllerMixin.class,
RequestContextSCAContentMixin.class,
UseComponentMixin.class,
UseSCAPropertyControllerMixin.class,
SCALightContentControllerMixin.class,
UseLifeCycleControllerMixin.class,
LifeCycleSCAContentMixin.class})
protected SCAExtendedContentController scacc;
}
......@@ -23,21 +23,42 @@
package org.ow2.frascati.tinfi.membrane;
import org.oasisopen.sca.ComponentContext;
import org.objectweb.fractal.api.control.BindingController;
import org.objectweb.fractal.fraclet.extensions.Controller;
import org.objectweb.fractal.fraclet.extensions.Membrane;
import org.objectweb.fractal.julia.BasicControllerMixin;
import org.objectweb.fractal.julia.UseComponentMixin;
import org.objectweb.fractal.julia.control.binding.CheckBindingMixin;
import org.objectweb.fractal.julia.control.binding.ContentBindingMixin;
import org.objectweb.fractal.julia.control.binding.LifeCycleBindingMixin;
import org.objectweb.fractal.julia.control.binding.TypeBindingMixin;
import org.objectweb.fractal.julia.control.content.UseSuperControllerMixin;
import org.objectweb.fractal.julia.control.lifecycle.BasicLifeCycleControllerMixin;
import org.objectweb.fractal.julia.control.lifecycle.BasicLifeCycleCoordinatorMixin;
import org.objectweb.fractal.julia.control.lifecycle.ContainerLifeCycleMixin;
import org.objectweb.fractal.julia.control.lifecycle.LifeCycleCoordinator;
import org.objectweb.fractal.julia.control.lifecycle.TypeLifeCycleMixin;
import org.objectweb.fractal.julia.control.lifecycle.UseLifeCycleControllerMixin;
import org.objectweb.fractal.julia.control.name.UseNameControllerMixin;
import org.objectweb.fractal.juliac.proxy.LifeCycleSourceCodeGenerator;
import org.ow2.frascati.tinfi.api.control.SCAIntentController;
import org.ow2.frascati.tinfi.api.control.SCAPropertyController;
import org.ow2.frascati.tinfi.control.binding.BasicBindingControllerMixin;
import org.ow2.frascati.tinfi.control.component.ComponentContextMixin;
import org.ow2.frascati.tinfi.control.content.LifeCycleSCAContentMixin;
import org.ow2.frascati.tinfi.control.content.RequestContextSCAContentMixin;
import org.ow2.frascati.tinfi.control.content.SCAContentControllerMixin;
import org.ow2.frascati.tinfi.control.content.SCAExtendedContentController;
import org.ow2.frascati.tinfi.control.content.UseSCAContentControllerMixin;
import org.ow2.frascati.tinfi.control.intent.LifeCycleIntentMixin;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentControllerMixin;
import org.ow2.frascati.tinfi.control.intent.SCAIntentControllerMixin;
import org.ow2.frascati.tinfi.control.lifecycle.SCALifeCycleMixin;
import org.ow2.frascati.tinfi.control.property.SCAPrimitivePropertyControllerMixin;
import org.ow2.frascati.tinfi.control.property.SCAPropertyControllerMixin;
import org.ow2.frascati.tinfi.control.property.SCAPropertyPromoterMixin;
import org.ow2.frascati.tinfi.control.property.UseSCAPropertyControllerMixin;
import org.ow2.frascati.tinfi.opt.oo.InterceptorClassGenerator;
import org.ow2.frascati.tinfi.opt.oo.SCAContentInterceptorSourceCodeGenerator;
import org.ow2.frascati.tinfi.opt.oo.SCAIntentInterceptorSourceCodeGenerator;
......@@ -57,22 +78,71 @@ import org.ow2.frascati.tinfi.opt.oo.SCATinfiInterceptorSourceCodeGenerator;
LifeCycleSourceCodeGenerator.class,
SCAContentInterceptorSourceCodeGenerator.class,
SCAIntentInterceptorSourceCodeGenerator.class})
public class SCAPrimitive extends SCALightPrimitive {
public class SCAPrimitive extends Primitive {
final public static String NAME = "scaPrimitive";
// ---------------------------------------------------------
// Redefining Julia controllers
// ---------------------------------------------------------
@Controller(
name="/sca-content-controller",
impl="SCAContentControllerImpl",
name="binding-controller",
impl="SCABindingControllerImpl",
mixins={
BasicControllerMixin.class,
RequestContextSCAContentMixin.class,
UseSCAContentControllerMixin.class,
UseComponentMixin.class,
SCAContentControllerMixin.class,
BasicBindingControllerMixin.class,
CheckBindingMixin.class,
TypeBindingMixin.class,
UseSuperControllerMixin.class,
ContentBindingMixin.class,
UseLifeCycleControllerMixin.class,
LifeCycleSCAContentMixin.class})
protected SCAExtendedContentController scacc;
LifeCycleBindingMixin.class})
protected BindingController bc;
@Controller(
name="lifecycle-controller",
impl="SCALifeCycleControllerImpl",
mixins={
BasicControllerMixin.class,
UseComponentMixin.class,
BasicLifeCycleCoordinatorMixin.class,
BasicLifeCycleControllerMixin.class,
TypeLifeCycleMixin.class,
ContainerLifeCycleMixin.class,
UseSCAContentControllerMixin.class,
SCALifeCycleMixin.class})
protected LifeCycleCoordinator lc;
// ---------------------------------------------------------
// Tinfi controllers
// ---------------------------------------------------------
@Controller(
name="sca-component-controller",
impl="SCAComponentControllerImpl",
mixins={
BasicControllerMixin.class,
UseComponentMixin.class,
UseSCAContentControllerMixin.class,
UseSCAPropertyControllerMixin.class,
ComponentContextMixin.class})
protected ComponentContext compctx;
@Controller(
name="sca-property-controller",
impl="SCAPrimitivePropertyControllerImpl",
mixins={
BasicControllerMixin.class,
UseSCAContentControllerMixin.class,
UseNameControllerMixin.class,
SCAPrimitivePropertyControllerMixin.class,
SCAPropertyControllerMixin.class,
SCAPropertyPromoterMixin.class})
protected SCAPropertyController scapc;
@Controller(
name="sca-intent-controller",
impl="SCAPrimitiveIntentControllerImpl",
......@@ -84,5 +154,21 @@ public class SCAPrimitive extends SCALightPrimitive {
UseNameControllerMixin.class,
UseLifeCycleControllerMixin.class,
LifeCycleIntentMixin.class})
protected SCAIntentController scaic;
protected SCAIntentController scaic;
// ---------------------------------------------------------
// Tinfi hidden controllers
// ---------------------------------------------------------
@Controller(
name="/sca-content-controller",
impl="SCAContentControllerImpl",
mixins={
BasicControllerMixin.class,
RequestContextSCAContentMixin.class,
UseComponentMixin.class,
SCAContentControllerMixin.class,
UseLifeCycleControllerMixin.class,
LifeCycleSCAContentMixin.class})
protected SCAExtendedContentController scacc;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment