Skip to content

GitLab

Commit 26899d14 authored by Christophe Demarey's avatar Christophe Demarey
Browse files

Rename frascati.debug into frascati-debug in order to use debug intent with fscript

parent f7ff2bfe
Hide whitespace changes
Inline Side-by-side
assembly-factory/tests-conf/test-composites/src/main/resources/helloworld-debug-intent.composite
View file @ 26899d14
......@@ -31,7 +31,7 @@
<service name="print" promote="server" />
<component name="client">
<service name="r" requires="frascati.debug">
<service name="r" requires="frascati-debug">
<interface.java interface="java.lang.Runnable" />
</service>
......@@ -40,7 +40,7 @@
<implementation.java class="example.hw.ClientImpl" />
</component>
<component name="server" requires="frascati.debug">
<component name="server" requires="frascati-debug">
<implementation.java class="example.hw.ServerImpl" />
</component>
......
fscript/src/docbkx/fscript.xml
View file @ 26899d14
......@@ -196,7 +196,7 @@ Success (took 4 ms).</programlisting>
<programlisting>FScript&gt; i = $s/scaintent::*;
=&gt; a node-set with 1 element(s):
#&lt;scaintent: frascati.debug on s&gt;
#&lt;scaintent: frascati-debug on s&gt;
Success (took 1 ms).
FScript&gt; state($i)
......@@ -475,10 +475,10 @@ FScript&gt; value( $header )
<programlisting>FScript&gt; $c/scachild::server/scaintent::*
=&gt; a node-set with 1 element(s):
#&lt;scaintent: frascati.debug on s&gt;</programlisting>
#&lt;scaintent: frascati-debug on s&gt;</programlisting>
<para>In this example, we are discovering an intent named
f<varname>rascati.debug</varname> defined on the <varname>s</varname>
f<varname>rascati-debug</varname> defined on the <varname>s</varname>
interface (service) of the <varname>server</varname> component.</para>
</section>
......
fscript/src/test/resources/helloworld-rmi-standalone.composite
View file @ 26899d14
......@@ -27,14 +27,14 @@
<property name="composite-property">--></property>
<service name="rbis" promote="client/r" requires="frascati.debug">
<service name="rbis" promote="client/r" requires="frascati-debug">
<interface.java interface="java.lang.Runnable" />
</service>
<!-- Redefining the hellowordl-rmi-server composite for test purposes. -->
<component name="server">
<property name="server-property" source="$composite-property"/>
<service name="s" requires="frascati.debug">
<service name="s" requires="frascati-debug">
<frascati:binding.rmi host="localhost" serviceName="rmiservice" port="1099"/>
</service>
......
intents/debug/src/docbkx/debug-intent.xml
View file @ 26899d14
......@@ -61,7 +61,7 @@ SERVER: print done.</programlisting>
&lt;service name="r" promote="client"/&gt;
&lt;component name="client"&gt;
&lt;service name="r" <emphasis role="bold">requires="frascati.debug"</emphasis>&gt;
&lt;service name="r" <emphasis role="bold">requires="frascati-debug"</emphasis>&gt;
&lt;interface.java interface="java.lang.Runnable" /&gt;
&lt;/service&gt;
......@@ -71,7 +71,7 @@ SERVER: print done.</programlisting>
&lt;/component&gt;
&lt;component name="server"&gt;
&lt;service name="printService" <emphasis role="bold">requires="frascati.debug"</emphasis>&gt;
&lt;service name="printService" <emphasis role="bold">requires="frascati-debug"</emphasis>&gt;
&lt;interface.java interface="org.ow2.frascati.examples.helloworld.pojo.PrintService"/&gt;
&lt;/service&gt;
......
intents/debug/src/main/resources/frascati.debug.composite → intents/debug/src/main/resources/frascati-debug.composite
View file @ 26899d14
......@@ -20,7 +20,7 @@
<!-- -->
<!-- Author: Nicolas Dolet -->
<!-- -->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:di="http://debug-intent" name="frascati.debug">
<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"/>
</service>
......
intents/debug/src/main/resources/frascati-debug.composite_diagram 0 → 100644
View file @ 26899d14
<?xml version="1.0" encoding="UTF-8"?>
<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmi:id="_lGi1wIUSEd-jNaxUkenl2w" type="Sca" measurementUnit="Pixel">
<children xmi:type="notation:Node" xmi:id="_lI170IUSEd-jNaxUkenl2w" type="2001">
<children xmi:type="notation:Node" xmi:id="_lI2i4IUSEd-jNaxUkenl2w" type="5008"/>
<children xmi:type="notation:Node" xmi:id="_lI3J8IUSEd-jNaxUkenl2w" type="7001">
<styles xmi:type="notation:SortingStyle" xmi:id="_lI3J8YUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lI3J8oUSEd-jNaxUkenl2w"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lI3xAIUSEd-jNaxUkenl2w" type="7002">
<styles xmi:type="notation:SortingStyle" xmi:id="_lI3xAYUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lI3xAoUSEd-jNaxUkenl2w"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lI4YEIUSEd-jNaxUkenl2w" type="7003">
<styles xmi:type="notation:SortingStyle" xmi:id="_lI4YEYUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lI4YEoUSEd-jNaxUkenl2w"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lI4YE4USEd-jNaxUkenl2w" type="7004">
<children xmi:type="notation:Node" xmi:id="_lJAT4IUSEd-jNaxUkenl2w" type="3012">
<children xmi:type="notation:Node" xmi:id="_lJBiAIUSEd-jNaxUkenl2w" type="5007"/>
<children xmi:type="notation:Node" xmi:id="_lJBiAYUSEd-jNaxUkenl2w" type="7009">
<styles xmi:type="notation:SortingStyle" xmi:id="_lJBiAoUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lJBiA4USEd-jNaxUkenl2w"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lJCwIIUSEd-jNaxUkenl2w" type="7010">
<styles xmi:type="notation:SortingStyle" xmi:id="_lJCwIYUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lJCwIoUSEd-jNaxUkenl2w"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lJDXMIUSEd-jNaxUkenl2w" type="7011">
<styles xmi:type="notation:SortingStyle" xmi:id="_lJDXMYUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lJDXMoUSEd-jNaxUkenl2w"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lJDXM4USEd-jNaxUkenl2w" type="7012">
<styles xmi:type="notation:SortingStyle" xmi:id="_lJDXNIUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lJDXNYUSEd-jNaxUkenl2w"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_lJAT4YUSEd-jNaxUkenl2w" fontName="Lucida Grande"/>
<element xmi:type="sca:Component" href="frascati-debug.composite#//@composite/@component.0"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJAT4oUSEd-jNaxUkenl2w" x="59" y="3"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_lI4YFIUSEd-jNaxUkenl2w"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_lI4YFYUSEd-jNaxUkenl2w"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_lI170YUSEd-jNaxUkenl2w" fontName="Lucida Grande"/>
<element xmi:type="sca:Composite" href="frascati-debug.composite#//@composite"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_lI170oUSEd-jNaxUkenl2w" width="377" height="221"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_lGi1wYUSEd-jNaxUkenl2w"/>
<element xmi:type="sca:DocumentRoot" href="frascati-debug.composite#/"/>
</notation:Diagram>
intents/debug/src/main/resources/frascati.debug.composite_diagram deleted 100644 → 0
View file @ f7ff2bfe
<?xml version="1.0" encoding="UTF-8"?>
<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmi:id="_X7ixMB-SEd-x_4DUXm5yAQ" type="Sca" measurementUnit="Pixel">
<children xmi:type="notation:Node" xmi:id="_X-sy4B-SEd-x_4DUXm5yAQ" type="2001">
<children xmi:type="notation:Node" xmi:id="_X-tZ8B-SEd-x_4DUXm5yAQ" type="5008"/>
<children xmi:type="notation:Node" xmi:id="_X-uBAB-SEd-x_4DUXm5yAQ" type="7001">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-uBAR-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-uBAh-SEd-x_4DUXm5yAQ"/>
</children>
<children xmi:type="notation:Node" xmi:id="_X-uoEB-SEd-x_4DUXm5yAQ" type="7002">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-uoER-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-uoEh-SEd-x_4DUXm5yAQ"/>
</children>
<children xmi:type="notation:Node" xmi:id="_X-uoEx-SEd-x_4DUXm5yAQ" type="7003">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-uoFB-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-uoFR-SEd-x_4DUXm5yAQ"/>
</children>
<children xmi:type="notation:Node" xmi:id="_X-vPIB-SEd-x_4DUXm5yAQ" type="7004">
<children xmi:type="notation:Node" xmi:id="_X-3K8B-SEd-x_4DUXm5yAQ" type="3012">
<children xmi:type="notation:Node" xmi:id="_X-3yAB-SEd-x_4DUXm5yAQ" type="5007"/>
<children xmi:type="notation:Node" xmi:id="_X-4ZEB-SEd-x_4DUXm5yAQ" type="7009">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-4ZER-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-4ZEh-SEd-x_4DUXm5yAQ"/>
</children>
<children xmi:type="notation:Node" xmi:id="_X-4ZEx-SEd-x_4DUXm5yAQ" type="7010">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-4ZFB-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-4ZFR-SEd-x_4DUXm5yAQ"/>
</children>
<children xmi:type="notation:Node" xmi:id="_X-5AIB-SEd-x_4DUXm5yAQ" type="7011">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-5AIR-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-5AIh-SEd-x_4DUXm5yAQ"/>
</children>
<children xmi:type="notation:Node" xmi:id="_X-5AIx-SEd-x_4DUXm5yAQ" type="7012">
<styles xmi:type="notation:SortingStyle" xmi:id="_X-5AJB-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-5AJR-SEd-x_4DUXm5yAQ"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_X-3K8R-SEd-x_4DUXm5yAQ" fontName="Lucida Grande"/>
<element xmi:type="sca:Component" href="frascati.debug.composite#//@composite/@component.0"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_X-3K8h-SEd-x_4DUXm5yAQ" x="62" y="13"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_X-vPIR-SEd-x_4DUXm5yAQ"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_X-vPIh-SEd-x_4DUXm5yAQ"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_X-sy4R-SEd-x_4DUXm5yAQ" fontName="Lucida Grande"/>
<element xmi:type="sca:Composite" href="frascati.debug.composite#//@composite"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_X-sy4h-SEd-x_4DUXm5yAQ" width="361" height="241"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_X7ixMR-SEd-x_4DUXm5yAQ"/>
<element xmi:type="sca:DocumentRoot" href="frascati.debug.composite#/"/>
</notation:Diagram>
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