Skip to content
Snippets Groups Projects
Commit 68ce3dc7 authored by Sebastian Ebert's avatar Sebastian Ebert
Browse files

working on service transforms

parent 2e1a8a3a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/jastadd/flatter/transforms/ServiceChannelTransforms.jadd 0 → 100644
+ 17
− 0
View file @ 68ce3dc7
aspect ServiceChannelTransforms {
syn boolean DinerosTransition.canTransformServiceTransition() {
return this.getStaticTransitionInformation().isServiceTransitionInformation();
}
syn Page Page.transformServiceElement() {
Page res = new Page();
return res;
}
}
\ No newline at end of file
src/main/jastadd/flatter/transforms/ServicePrototypeTransforms.jadd
+ 1
− 0
View file @ 68ce3dc7
...@@ -8,6 +8,7 @@ aspect ServicePrototypeTransforms { ...@@ -8,6 +8,7 @@ aspect ServicePrototypeTransforms {
&& (!getId().endsWith(PnmlConstants.PAGE_SERVER_INSTANCE_SUFFIX))); && (!getId().endsWith(PnmlConstants.PAGE_SERVER_INSTANCE_SUFFIX)));
} }
// apply rule S3
syn Page Page.transformPrototypePage() { syn Page Page.transformPrototypePage() {
int serverCapacity = 0; int serverCapacity = 0;
......
src/main/resources/templates/ServiceConnectionTemplate.pnml
+ 37
− 96
View file @ 68ce3dc7
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<name> <name>
<text>DinerosTemplate</text> <text>DinerosTemplate</text>
</name> </name>
<page id="ServiceTemplatePage"> <page id="DinerosTemplatePage">
<place id="ServiceTogglePlace"> <place id="ServiceTogglePlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</graphics> </graphics>
</place> </place>
<place id="ClientToServicePlace"> <place id="ServiceClientCallConnectPlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</outputsignalbindings> </outputsignalbindings>
</toolspecific> </toolspecific>
<name> <name>
<text>ClientToServicePlace</text> <text>ServiceClientCallConnectPlace</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</graphics> </graphics>
</place> </place>
<place id="InputToOutputServicePlace"> <place id="ServiceClientRespConnectPlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</outputsignalbindings> </outputsignalbindings>
</toolspecific> </toolspecific>
<name> <name>
<text>InputToOutputServicePlace</text> <text>ServiceClientRespConnectPlace</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</graphics> </graphics>
</place> </place>
<place id="ServiceOutputPlace"> <place id="ServiceClientCallPlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</outputsignalbindings> </outputsignalbindings>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceOutputPlace</text> <text>ServiceClientCallPlace</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -92,8 +92,7 @@ ...@@ -92,8 +92,7 @@
</graphics> </graphics>
</place> </place>
<!-- new places after rework --> <place id="ServiceClientRespPlace">
<place id="ServiceToQueuePlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -102,7 +101,7 @@ ...@@ -102,7 +101,7 @@
</outputsignalbindings> </outputsignalbindings>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceToQueuePlace</text> <text>ServiceClientRespPlace</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -115,29 +114,7 @@ ...@@ -115,29 +114,7 @@
</graphics> </graphics>
</place> </place>
<place id="ServiceQueueToServerPlace"> <transition id="ServiceClientCallConnectTransition">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location>
<subnet>none</subnet>
<type>discretePlaceType</type>
<outputsignalbindings>
</outputsignalbindings>
</toolspecific>
<name>
<text>ServiceQueueToServerPlace</text>
<graphics>
<offset x="0" y="0" />
</graphics>
</name>
<initialMarking>
<text>0</text>
</initialMarking>
<graphics>
<position x="0" y="0"/>
</graphics>
</place>
<transition id="ServiceClientInputTransition">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -147,7 +124,7 @@ ...@@ -147,7 +124,7 @@
<inputsignalclause></inputsignalclause> <inputsignalclause></inputsignalclause>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceClientInputTransition</text> <text>ServiceClientCallConnectTransition</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -157,7 +134,7 @@ ...@@ -157,7 +134,7 @@
</graphics> </graphics>
</transition> </transition>
<transition id="ServiceServerInputTransition"> <transition id="ServiceClientRespConnectTransition">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -167,7 +144,7 @@ ...@@ -167,7 +144,7 @@
<inputsignalclause></inputsignalclause> <inputsignalclause></inputsignalclause>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceServerInputTransition</text> <text>ServiceClientRespConnectTransition</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -177,7 +154,7 @@ ...@@ -177,7 +154,7 @@
</graphics> </graphics>
</transition> </transition>
<transition id="ServiceServerOutputTransition"> <transition id="ServiceClientCallTransition">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -187,7 +164,7 @@ ...@@ -187,7 +164,7 @@
<inputsignalclause></inputsignalclause> <inputsignalclause></inputsignalclause>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceServerOutputTransition</text> <text>ServiceClientCallTransition</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -197,7 +174,7 @@ ...@@ -197,7 +174,7 @@
</graphics> </graphics>
</transition> </transition>
<transition id="ServiceClientOutputTransition"> <transition id="ServiceClientRespTransition">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
...@@ -207,7 +184,7 @@ ...@@ -207,7 +184,7 @@
<inputsignalclause></inputsignalclause> <inputsignalclause></inputsignalclause>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceClientOutputTransition</text> <text>ServiceClientRespTransition</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
...@@ -217,95 +194,59 @@ ...@@ -217,95 +194,59 @@
</graphics> </graphics>
</transition> </transition>
<transition id="ServiceClientConnectorTransition"> <!-- the reference target is just used here, because pnml does not allow dangling refs -->
<referencePlace id="ServiceCallRefPlace" ref="ServiceTogglePlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
<type>discreteTransitionType</type>
<inputsignalbindings>
</inputsignalbindings>
<inputsignalclause></inputsignalclause>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceClientConnectorTransition</text> <text>ServiceCallRefPlace</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
</name> </name>
<graphics> <graphics>
<position x="0" y="0"/> <position x="20" y="20"/>
</graphics> </graphics>
</transition> </referencePlace>
<!-- new transitions after rework --> <!-- the reference target is just used here, because pnml does not allow dangling refs -->
<transition id="ServiceQueueConnectorTransition"> <referencePlace id="ServiceRespRefPlace" ref="ServiceTogglePlace">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location> <location>none</location>
<subnet>none</subnet> <subnet>none</subnet>
<type>discreteTransitionType</type>
<inputsignalbindings>
</inputsignalbindings>
<inputsignalclause></inputsignalclause>
</toolspecific>
<name>
<text>ServiceQueueConnectorTransition</text>
<graphics>
<offset x="0" y="0" />
</graphics>
</name>
<graphics>
<position x="0" y="0"/>
</graphics>
</transition>
<transition id="ServiceQueueOverflowTransition">
<toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
<location>none</location>
<subnet>none</subnet>
<type>discreteTransitionType</type>
<inputsignalbindings>
</inputsignalbindings>
<inputsignalclause></inputsignalclause>
</toolspecific> </toolspecific>
<name> <name>
<text>ServiceQueueOverflowTransition</text> <text>ServiceRespRefPlace</text>
<graphics> <graphics>
<offset x="0" y="0" /> <offset x="0" y="0" />
</graphics> </graphics>
</name> </name>
<graphics> <graphics>
<position x="0" y="0"/> <position x="20" y="20"/>
</graphics> </graphics>
</transition> </referencePlace>
<arc id="arc-1" source="ServiceTogglePlace" target="ServiceClientInputTransition"> <arc id="arc-1" source="ServiceCallRefPlace" target="ServiceClientCallConnectTransition">
</arc> </arc>
<arc id="arc-2" source="ServiceClientInputTransition" target="ClientToServicePlace"> <arc id="arc-2" source="ServiceTogglePlace" target="ServiceClientCallConnectTransition">
</arc> </arc>
<!-- <arc id="arc-3" source="ClientToServicePlace" target="ServiceServerInputTransition"> <arc id="arc-3" source="ServiceClientCallConnectTransition" target="ServiceClientCallConnectPlace">
</arc> -->
<arc id="arc-4" source="ServiceServerInputTransition" target="InputToOutputServicePlace">
</arc> </arc>
<arc id="arc-5" source="InputToOutputServicePlace" target="ServiceServerOutputTransition"> <arc id="arc-4" source="ServiceClientCallConnectPlace" target="ServiceClientCallTransition">
</arc> </arc>
<arc id="arc-6" source="ServiceServerOutputTransition" target="ServiceOutputPlace"> <arc id="arc-5" source="ServiceClientCallTransition" target="ServiceClientCallPlace">
</arc> </arc>
<arc id="arc-7" source="ServiceOutputPlace" target="ServiceClientOutputTransition"> <arc id="arc-6" source="ServiceClientRespConnectTransition" target="ServiceTogglePlace">
</arc> </arc>
<arc id="arc-8" source="ServiceClientOutputTransition" target="ServiceTogglePlace"> <arc id="arc-7" source="ServiceClientRespConnectTransition" target="ServiceRespRefPlace">
</arc> </arc>
<arc id="arc-8" source="ServiceClientRespConnectPlace" target="ServiceClientRespConnectTransition">
<!-- new arcs after rework -->
<arc id="arc-9" source="ClientToServicePlace" target="ServiceClientConnectorTransition">
</arc>
<!-- <arc id="arc-10" source="ServiceQueueConnectorTransition" target="ServiceToQueuePlace">
</arc> -->
<arc id="arc-11" source="ServiceToQueuePlace" target="ServiceQueueConnectorTransition">
</arc> </arc>
<arc id="arc-12" source="ServiceToQueuePlace" target="ServiceQueueOverflowTransition"> <arc id="arc-9" source="ServiceClientRespTransition" target="ServiceClientRespConnectPlace">
</arc> </arc>
<arc id="arc-13" source="ServiceQueueConnectorTransition" target="ServiceQueueToServerPlace"> <arc id="arc-10" source="ServiceClientRespPlace" target="ServiceClientRespTransition">
</arc> </arc>
</page> </page>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment