Mail Archive Home | fractal-commits List | December 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Saturday, December 16, 2006 @ 20:43:33
Author: seintur
Path: /cvsroot/fractal/julia
Added:
src/org/objectweb/fractal/juliak/control/content/SuperController.fractal
src/org/objectweb/fractal/juliak/control/content/SuperControllerDef.java
src/org/objectweb/fractal/juliak/control/content/SuperControllerType.fractal
src/org/objectweb/fractal/juliak/control/content/UseSuperControllerType.fractal
Modified: src/org/objectweb/fractal/juliak/FractalHelper.java
src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal
src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal
src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal
src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal
src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal
src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal
src/org/objectweb/fractal/juliak/control/content/package.html
src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal
src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal
src/org/objectweb/fractal/juliak/membrane/Composite.fractal
src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal
src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal
src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java
src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal
src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal
src/org/objectweb/fractal/juliak/membrane/Primitive.fractal
src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal
src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal
test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal
Removed:
src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal
src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java
src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal
src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal
src/org/objectweb/fractal/juliak/control/superc/package.html
Moving the super controller definition to the same package as the content
controller.
---------------------------------------------------------------------------------------------+
src/org/objectweb/fractal/juliak/FractalHelper.java
| 2
src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal
| 2
src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal
| 2
src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal
| 2
src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal
| 2
src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal
| 2
src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal
| 2
src/org/objectweb/fractal/juliak/control/content/SuperController.fractal
| 34 +++++++
src/org/objectweb/fractal/juliak/control/content/SuperControllerDef.java
| 46 ++++++++++
src/org/objectweb/fractal/juliak/control/content/SuperControllerType.fractal
| 33 +++++++
src/org/objectweb/fractal/juliak/control/content/UseSuperControllerType.fractal
| 33 +++++++
src/org/objectweb/fractal/juliak/control/content/package.html
| 4
src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal
| 34 -------
src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java
| 46 ----------
src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal
| 33 -------
src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal
| 33 -------
src/org/objectweb/fractal/juliak/control/superc/package.html
| 35 -------
src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal
| 4
src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal
| 4
src/org/objectweb/fractal/juliak/membrane/Composite.fractal
| 2
src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal
| 4
src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal
| 2
src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java
| 2
src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal
| 4
src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal
| 4
src/org/objectweb/fractal/juliak/membrane/Primitive.fractal
| 2
src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal
| 4
src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal
| 2
test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal
| 2
29 files changed, 174 insertions(+), 207 deletions(-)
Index: julia/src/org/objectweb/fractal/juliak/FractalHelper.java
diff -u julia/src/org/objectweb/fractal/juliak/FractalHelper.java:1.5
julia/src/org/objectweb/fractal/juliak/FractalHelper.java:1.6
--- julia/src/org/objectweb/fractal/juliak/FractalHelper.java:1.5 Fri
Nov 10 21:06:38 2006
+++ julia/src/org/objectweb/fractal/juliak/FractalHelper.java Sat Dec 16
20:43:32 2006
@@ -42,7 +42,7 @@
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.api.type.TypeFactory;
import org.objectweb.fractal.julia.control.content.SuperControllerNotifier;
-import org.objectweb.fractal.juliak.control.superc.SuperControllerDef;
+import org.objectweb.fractal.juliak.control.content.SuperControllerDef;
/**
Index:
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeAutoBindingController.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.control.binding.CompositeAutoBindingController"
-
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.superc.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType,org.objectweb.fractal.juliak.control.content.UseContentControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.content.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType,org.objectweb.fractal.juliak.control.content.UseContentControllerType"
>
<content
class="org.objectweb.fractal.juliak.control.binding.CompositeAutoBindingControllerImpl"
/>
Index:
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeBindingController.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.control.binding.CompositeBindingController"
-
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.superc.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType,org.objectweb.fractal.juliak.control.content.UseContentControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.content.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType,org.objectweb.fractal.juliak.control.content.UseContentControllerType"
>
<content
class="org.objectweb.fractal.juliak.control.binding.CompositeBindingControllerImpl"
/>
Index:
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/control/binding/CompositeTemplateBindingController.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.control.binding.CompositeTemplateBindingController"
-
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.superc.UseSuperControllerType,org.objectweb.fractal.juliak.control.content.UseContentControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.content.UseSuperControllerType,org.objectweb.fractal.juliak.control.content.UseContentControllerType"
>
<content
class="org.objectweb.fractal.juliak.control.binding.CompositeBindingControllerImpl"
/>
Index:
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerAutoBindingController.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.control.binding.ContainerAutoBindingController"
-
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.superc.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.content.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType"
>
<content
class="org.objectweb.fractal.juliak.control.binding.ContainerAutoBindingControllerImpl"
/>
Index:
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/control/binding/ContainerBindingController.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.control.binding.ContainerBindingController"
-
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.superc.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.content.UseSuperControllerType,org.objectweb.fractal.juliak.control.lifecycle.UseLifeCycleControllerType"
>
<content
class="org.objectweb.fractal.juliak.control.binding.ContainerBindingControllerImpl"
/>
Index:
julia/src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/control/binding/PrimitiveBindingController.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.control.binding.PrimitiveBindingController"
-
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.superc.UseSuperControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.UseComponentControllerType,org.objectweb.fractal.juliak.control.content.UseSuperControllerType"
>
<content
class="org.objectweb.fractal.juliak.control.binding.PrimitiveBindingControllerImpl"
/>
Index:
julia/src/org/objectweb/fractal/juliak/control/content/SuperController.fractal
diff -u /dev/null
julia/src/org/objectweb/fractal/juliak/control/content/SuperController.fractal:1.1
--- /dev/null Sat Dec 16 20:43:33 2006
+++
julia/src/org/objectweb/fractal/juliak/control/content/SuperController.fractal
Sat Dec 16 20:43:32 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
+
+<!--
+ * Julia
+ * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ *
+ * Contact: Lionel.Seinturier@xxxxxxx
+ *
+ * Author: Lionel Seinturier
+ -->
+
+<definition
+ name="org.objectweb.fractal.juliak.control.content.SuperController"
+
extends="org.objectweb.fractal.juliak.control.content.SuperControllerType" >
+
+ <content
class="org.objectweb.fractal.juliak.control.content.SuperControllerImpl" />
+
+ <controller desc="mPrimitive" />
+</definition>
Index:
julia/src/org/objectweb/fractal/juliak/control/content/SuperControllerDef.java
diff -u /dev/null
julia/src/org/objectweb/fractal/juliak/control/content/SuperControllerDef.java:1.1
--- /dev/null Sat Dec 16 20:43:33 2006
+++
julia/src/org/objectweb/fractal/juliak/control/content/SuperControllerDef.java
Sat Dec 16 20:43:32 2006
@@ -0,0 +1,46 @@
+/***
+ * Julia
+ * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ *
+ * Contact: Lionel.Seinturier@xxxxxxx
+ *
+ * Author: Lionel Seinturier
+ */
+
+package org.objectweb.fractal.juliak.control.content;
+
+import org.objectweb.fractal.api.type.InterfaceType;
+import org.objectweb.fractal.julia.control.content.SuperControllerNotifier;
+import org.objectweb.fractal.julia.type.BasicInterfaceType;
+
+
+/**
+ * This interface contains data related to the super controller.
+ *
+ * @author Lionel Seinturier <Lionel.Seinturier@xxxxxxx>
+ * @since 2.5
+ */
+public interface SuperControllerDef {
+
+ final public static String NAME = "super-controller";
+
+ final public static InterfaceType TYPE =
+ new BasicInterfaceType(
+ NAME,
+ SuperControllerNotifier.class.getName(),
+ false, false, false);
+}
Index:
julia/src/org/objectweb/fractal/juliak/control/content/SuperControllerType.fractal
diff -u /dev/null
julia/src/org/objectweb/fractal/juliak/control/content/SuperControllerType.fractal:1.1
--- /dev/null Sat Dec 16 20:43:33 2006
+++
julia/src/org/objectweb/fractal/juliak/control/content/SuperControllerType.fractal
Sat Dec 16 20:43:32 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
+
+<!--
+ * Julia
+ * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ *
+ * Contact: Lionel.Seinturier@xxxxxxx
+ *
+ * Author: Lionel Seinturier
+ -->
+
+<definition
name="org.objectweb.fractal.juliak.control.content.SuperControllerType">
+ <interface
+ name="//super-controller"
+
signature="org.objectweb.fractal.julia.control.content.SuperControllerNotifier"
+ role="server"
+ />
+</definition>
Index:
julia/src/org/objectweb/fractal/juliak/control/content/UseSuperControllerType.fractal
diff -u /dev/null
julia/src/org/objectweb/fractal/juliak/control/content/UseSuperControllerType.fractal:1.1
--- /dev/null Sat Dec 16 20:43:33 2006
+++
julia/src/org/objectweb/fractal/juliak/control/content/UseSuperControllerType.fractal
Sat Dec 16 20:43:32 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
+
+<!--
+ * Julia
+ * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ *
+ * Contact: Lionel.Seinturier@xxxxxxx
+ *
+ * Author: Lionel Seinturier
+ -->
+
+<definition
name="org.objectweb.fractal.juliak.control.content.UseSuperControllerType">
+ <interface
+ name="//super-controller"
+
signature="org.objectweb.fractal.julia.control.content.SuperControllerNotifier"
+ role="client"
+ />
+</definition>
Index: julia/src/org/objectweb/fractal/juliak/control/content/package.html
diff -u
julia/src/org/objectweb/fractal/juliak/control/content/package.html:1.3
julia/src/org/objectweb/fractal/juliak/control/content/package.html:1.4
--- julia/src/org/objectweb/fractal/juliak/control/content/package.html:1.3
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/control/content/package.html Sat
Dec 16 20:43:32 2006
@@ -27,7 +27,9 @@
<p>
Provides the definition of the
{@link org.objectweb.fractal.api.control.ContentController}
-control component.
+and the
+{@link org.objectweb.fractal.api.control.SuperController}
+control components.
@since 2.5
</p>
Index:
julia/src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal:removed
---
julia/src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal:1.2
Fri Nov 10 21:06:38 2006
+++
julia/src/org/objectweb/fractal/juliak/control/superc/SuperController.fractal
Sat Dec 16 20:43:33 2006
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
-
-<!--
- * Julia
- * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * 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
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- -->
-
-<definition
- name="org.objectweb.fractal.juliak.control.superc.SuperController"
-
extends="org.objectweb.fractal.juliak.control.superc.SuperControllerType" >
-
- <content
class="org.objectweb.fractal.juliak.control.content.SuperControllerImpl" />
-
- <controller desc="mPrimitive" />
-</definition>
Index:
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java
diff -u
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java:1.3
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java:removed
---
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java:1.3
Fri Nov 10 21:06:38 2006
+++
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerDef.java
Sat Dec 16 20:43:33 2006
@@ -1,46 +0,0 @@
-/***
- * Julia
- * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * 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
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- */
-
-package org.objectweb.fractal.juliak.control.superc;
-
-import org.objectweb.fractal.api.type.InterfaceType;
-import org.objectweb.fractal.julia.control.content.SuperControllerNotifier;
-import org.objectweb.fractal.julia.type.BasicInterfaceType;
-
-
-/**
- * This interface contains data related to the super controller.
- *
- * @author Lionel Seinturier <Lionel.Seinturier@xxxxxxx>
- * @since 2.5
- */
-public interface SuperControllerDef {
-
- final public static String NAME = "super-controller";
-
- final public static InterfaceType TYPE =
- new BasicInterfaceType(
- NAME,
- SuperControllerNotifier.class.getName(),
- false, false, false);
-}
Index:
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal:removed
---
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal:1.2
Fri Nov 10 21:06:38 2006
+++
julia/src/org/objectweb/fractal/juliak/control/superc/SuperControllerType.fractal
Sat Dec 16 20:43:33 2006
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
-
-<!--
- * Julia
- * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * 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
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- -->
-
-<definition
name="org.objectweb.fractal.juliak.control.superc.SuperControllerType">
- <interface
- name="//super-controller"
-
signature="org.objectweb.fractal.julia.control.content.SuperControllerNotifier"
- role="server"
- />
-</definition>
Index:
julia/src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal:1.2
julia/src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal:removed
---
julia/src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal:1.2
Fri Nov 10 21:06:38 2006
+++
julia/src/org/objectweb/fractal/juliak/control/superc/UseSuperControllerType.fractal
Sat Dec 16 20:43:33 2006
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
-
-<!--
- * Julia
- * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * 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
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- -->
-
-<definition
name="org.objectweb.fractal.juliak.control.superc.UseSuperControllerType">
- <interface
- name="//super-controller"
-
signature="org.objectweb.fractal.julia.control.content.SuperControllerNotifier"
- role="client"
- />
-</definition>
Index: julia/src/org/objectweb/fractal/juliak/control/superc/package.html
diff -u
julia/src/org/objectweb/fractal/juliak/control/superc/package.html:1.3
julia/src/org/objectweb/fractal/juliak/control/superc/package.html:removed
--- julia/src/org/objectweb/fractal/juliak/control/superc/package.html:1.3
Fri Nov 10 21:06:38 2006
+++ julia/src/org/objectweb/fractal/juliak/control/superc/package.html Sat
Dec 16 20:43:33 2006
@@ -1,35 +0,0 @@
-<!--
- * Julia
- * Copyright (C) 2005-2006 INRIA, France Telecom, USTL
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * 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
- *
- * Contact: Lionel.Seinturier@xxxxxxx
- *
- * Author: Lionel Seinturier
- -->
-
-<html>
-<body>
-
-<p>
-Provides the definition of the
-{@link org.objectweb.fractal.api.control.SuperController}
-control component.
-@since 2.5
-</p>
-
-</body>
-</html>
Index:
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal:1.2
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal:1.2
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingComposite.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.membrane.AutoBindingComposite"
-
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType,org.objectweb.fractal.juliak.control.membrane.MembraneControllerType"
>
+
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType,org.objectweb.fractal.juliak.control.membrane.MembraneControllerType"
>
<component name="Comp"
definition="org.objectweb.fractal.juliak.control.component.ComponentController"
/>
@@ -44,7 +44,7 @@
definition="org.objectweb.fractal.juliak.control.content.ContentController" />
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<binding client="this.//component" server="Comp.//component" />
<binding client="this.//name-controller"
server="NC.//name-controller" />
Index:
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal:1.3
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal:1.4
---
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal:1.3
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/membrane/AutoBindingPrimitive.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.membrane.AutoBindingPrimitive"
-
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.interceptor.InterceptorControllerType,org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType,org.objectweb.fractal.juliak.control.membrane.MembraneControllerType"
>
+
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.interceptor.InterceptorControllerType,org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType,org.objectweb.fractal.juliak.control.membrane.MembraneControllerType"
>
<component name="Comp"
definition="org.objectweb.fractal.juliak.control.component.ComponentController"
/>
@@ -41,7 +41,7 @@
definition="org.objectweb.fractal.juliak.control.binding.ContainerAutoBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="IC"
definition="org.objectweb.fractal.juliak.control.lifecycle.LifeCycleInterceptor"
/>
Index: julia/src/org/objectweb/fractal/juliak/membrane/Composite.fractal
diff -u julia/src/org/objectweb/fractal/juliak/membrane/Composite.fractal:1.2
julia/src/org/objectweb/fractal/juliak/membrane/Composite.fractal:1.3
--- julia/src/org/objectweb/fractal/juliak/membrane/Composite.fractal:1.2
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/Composite.fractal Sat
Dec 16 20:43:32 2006
@@ -41,7 +41,7 @@
definition="org.objectweb.fractal.juliak.control.binding.CompositeBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="CC"
definition="org.objectweb.fractal.juliak.control.content.CompositeContentController"
/>
Index:
julia/src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal:1.2
julia/src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal:1.2
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/CompositeTemplate.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.membrane.CompositeTemplate"
-
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType"
>
+
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType"
>
<component name="Comp"
definition="org.objectweb.fractal.juliak.control.component.ComponentController"
/>
@@ -38,7 +38,7 @@
definition="org.objectweb.fractal.juliak.control.binding.CompositeTemplateBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="CC"
definition="org.objectweb.fractal.juliak.control.content.ContentController" />
Index: julia/src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal:1.2
julia/src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal:1.3
--- julia/src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal:1.2
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/CompositeType.fractal
Sat Dec 16 20:43:32 2006
@@ -26,6 +26,6 @@
<definition
name="org.objectweb.fractal.juliak.membrane.CompositeType"
-
extends="org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType"
>
</definition>
Index: julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java:1.4
julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java:1.5
--- julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java:1.4
Sat Nov 11 18:17:21 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/MPrimitiveImpl.java Sat
Dec 16 20:43:32 2006
@@ -45,8 +45,8 @@
import org.objectweb.fractal.julia.control.content.SuperControllerNotifier;
import org.objectweb.fractal.juliak.control.binding.BindingControllerDef;
import org.objectweb.fractal.juliak.control.component.ComponentControllerDef;
+import org.objectweb.fractal.juliak.control.content.SuperControllerDef;
import org.objectweb.fractal.juliak.control.name.NameControllerDef;
-import org.objectweb.fractal.juliak.control.superc.SuperControllerDef;
import org.objectweb.fractal.juliak.factory.InterfaceInstanceGenerator;
Index:
julia/src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal:1.3
julia/src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal:1.4
---
julia/src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal:1.3
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/membrane/ParametricCompositeTemplate.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.membrane.ParametricCompositeTemplate"
-
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.attribute.AttributeControllerType,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType"
>
+
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.attribute.AttributeControllerType,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType,org.objectweb.fractal.juliak.control.content.ContentControllerType"
>
<component name="Comp"
definition="org.objectweb.fractal.juliak.control.component.ComponentController"
/>
@@ -41,7 +41,7 @@
definition="org.objectweb.fractal.juliak.control.binding.PrimitiveBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="CC"
definition="org.objectweb.fractal.juliak.control.content.ContentController" />
Index:
julia/src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal:1.3
julia/src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal:1.4
---
julia/src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal:1.3
Fri Nov 10 21:06:37 2006
+++
julia/src/org/objectweb/fractal/juliak/membrane/ParametricPrimitiveTemplate.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.membrane.ParametricPrimitiveTemplate"
-
extends="org.objectweb.fractal.juliak.control.attribute.AttributeControllerType,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType,org.objectweb.fractal.juliak.control.membrane.MembraneControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.attribute.AttributeControllerType,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType,org.objectweb.fractal.juliak.control.membrane.MembraneControllerType"
>
<component name="Comp"
definition="org.objectweb.fractal.juliak.control.component.ComponentController"
/>
@@ -41,7 +41,7 @@
definition="org.objectweb.fractal.juliak.control.binding.PrimitiveBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="FC"
definition="org.objectweb.fractal.juliak.control.factory.FactoryController" />
Index: julia/src/org/objectweb/fractal/juliak/membrane/Primitive.fractal
diff -u julia/src/org/objectweb/fractal/juliak/membrane/Primitive.fractal:1.3
julia/src/org/objectweb/fractal/juliak/membrane/Primitive.fractal:1.4
--- julia/src/org/objectweb/fractal/juliak/membrane/Primitive.fractal:1.3
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/Primitive.fractal Sat
Dec 16 20:43:32 2006
@@ -41,7 +41,7 @@
definition="org.objectweb.fractal.juliak.control.binding.ContainerBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="IC"
definition="org.objectweb.fractal.juliak.control.lifecycle.LifeCycleInterceptor"
/>
Index:
julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal:1.2
julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal:1.3
---
julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal:1.2
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveTemplate.fractal
Sat Dec 16 20:43:32 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.juliak.membrane.PrimitiveTemplate"
-
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType"
>
+
extends="org.objectweb.fractal.juliak.membrane.Root,org.objectweb.fractal.juliak.control.factory.FactoryControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType"
>
<component name="Comp"
definition="org.objectweb.fractal.juliak.control.component.ComponentController"
/>
@@ -38,7 +38,7 @@
definition="org.objectweb.fractal.juliak.control.binding.PrimitiveBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="FC"
definition="org.objectweb.fractal.juliak.control.factory.FactoryController" />
Index: julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal
diff -u
julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal:1.2
julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal:1.3
--- julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal:1.2
Fri Nov 10 21:06:37 2006
+++ julia/src/org/objectweb/fractal/juliak/membrane/PrimitiveType.fractal
Sat Dec 16 20:43:32 2006
@@ -26,6 +26,6 @@
<definition
name="org.objectweb.fractal.juliak.membrane.PrimitiveType"
-
extends="org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.superc.SuperControllerType"
>
+
extends="org.objectweb.fractal.juliak.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.juliak.control.binding.BindingControllerType,org.objectweb.fractal.juliak.control.component.ComponentControllerType,org.objectweb.fractal.juliak.control.name.NameControllerType,org.objectweb.fractal.juliak.control.content.SuperControllerType"
>
</definition>
Index:
julia/test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal
diff -u
julia/test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal:1.2
julia/test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal:1.3
---
julia/test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal:1.2
Fri Nov 10 21:06:38 2006
+++
julia/test/conform/org/objectweb/fractal/julia/conform/controllers/StatPrimitive.fractal
Sat Dec 16 20:43:32 2006
@@ -41,7 +41,7 @@
definition="org.objectweb.fractal.juliak.control.binding.ContainerBindingController"
/>
<component name="SC"
-
definition="org.objectweb.fractal.juliak.control.superc.SuperController" />
+
definition="org.objectweb.fractal.juliak.control.content.SuperController" />
<component name="IC"
definition="org.objectweb.fractal.julia.conform.controllers.StatPrimitiveInterceptor"
/>
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.