You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2024/12/02 15:23:26 UTC

(directory-site) branch master updated: Some page updates

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 719f3b95 Some page updates
719f3b95 is described below

commit 719f3b95c9ed4431baad4e2739a76fa7ad9d127e
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon Dec 2 16:23:17 2024 +0100

    Some page updates
---
 .../internal-design-guide/4.2-asn1-ldap-message.md | 128 +++++++++++--------
 .../images/asn1-modify-request.graphml             | 140 +++------------------
 2 files changed, 95 insertions(+), 173 deletions(-)

diff --git a/source/api/internal-design-guide/4.2-asn1-ldap-message.md b/source/api/internal-design-guide/4.2-asn1-ldap-message.md
index a6d9629b..838fe6a1 100644
--- a/source/api/internal-design-guide/4.2-asn1-ldap-message.md
+++ b/source/api/internal-design-guide/4.2-asn1-ldap-message.md
@@ -10,14 +10,17 @@ navNextText: 5 - Network
 
 ## Table of content
 
-* [4.2 - ASN/1 LDAP Grammar](4.2-asn1-ldap-message.html#asn1-ldap-grammar)
-     * [4.2.1 - LDAPMessage](#LDAPMessage)
-     * [4.2.1 - LDAPMessage](#LdapResult)
-     * [4.2.2 - BindRequest](#BindRequest-message)
-     * [4.2.3 - BindResponse](#BindResponse-message)
+* [4.2 - ASN/1 LDAP Grammar](#asn1-ldap-grammar)
+     * [LDAPMessage](#ldapmessage)
+     * [LDAPMessage](#ldapresult)
+     * [AddRequest](#addrequest-operation)
+     * [AddResponse](#addresponse-operation)
+     * [BindRequest](#bindrequest-operation)
+     * [BindResponse](#bindresponse-operation)
+     * [UnbindRequest](#unbindrequest-operation)
 
 
-# 4-2 - ASN/1 LDAP grammar
+# ASN/1 LDAP grammar
 
 The **LDAP** grammar is defined in [RFC 4511, appendix B](https://www.rfc-editor.org/rfc/rfc4511#appendix-B).
 
@@ -305,7 +308,7 @@ Lightweight-Directory-Access-Protocol-V3 {1 3 6 1 1 18}
 
 ## LdapMessage
 
-The *LDAPMessage* grammar starts with this part:
+The **LDAPMessage** grammar starts with this part:
 
 ```
         LDAPMessage ::= SEQUENCE {
@@ -347,10 +350,10 @@ The following picture gives a clear view of the existing transitions:
 <img src="images/asn1-ldap-message.png" alt="LDAP message state machine" width="100%"/>
 
 The green boxes are sub-transitions, which will be descibed below. 
-The red arrow indactes which parts are mandatory.
-Each transition is based on the tags used between two states.
+The red arrow indicates which parts are mandatory.
+Each transition is based on the tag used between two states.
 
-Here is a flat representation of a LDAP message structure, where we see the encapsulated **TLVs**:
+Here is a flat representation of a **LDAP** message structure, where we see the encapsulated **TLVs**:
 
 ```
 
@@ -400,9 +403,9 @@ It covers all the existing **LDAP** messages.
 The **LDAPResult** element is part of all the **LDAP** response. It contains the following informations:
 
 * A result code, indicating either a success (code 0) or an error (code from 1 to 80, but it may be higher in a future version)
-* A DN representing the associated entry 
+* A **DN** representing the associated entry 
 * A diagnistic message in case of an error
-* An optional list of LDP URL that may be able to process the operation.
+* An optional list of **LDAP URL** that may be able to process the operation.
 
 Here is the complete grammar, as defined in [RFC4511](https://www.rfc-editor.org/rfc/rfc4511):
 
@@ -464,32 +467,47 @@ The associated state machine is given by this schema:
 
 <img src="images/asn1-ldap-result.png" alt="LDAPResult state machine" width="100%"/>
 
+## AddRequest operation
 
+The **BindRequest** message grammar is the following:
 
-## BindRequest
-
-```text
+```
         BindRequest ::= [APPLICATION 0] SEQUENCE {
              version                 INTEGER (1 ..  127),
-             name                    LDAPDN,
+             name                    OCTET STRING,
              authentication          AuthenticationChoice }
 
         AuthenticationChoice ::= CHOICE {
              simple                  [0] OCTET STRING,
-                                     -- 1 and 2 reserved
              sasl                    [3] SaslCredentials,
              ...  }
 
         SaslCredentials ::= SEQUENCE {
-             mechanism               LDAPString,
+             mechanism               OCTET STRING,
              credentials             OCTET STRING OPTIONAL }
+```
+
+Its state machine is shown in this picture:
 
+<img src="images/asn1-bind-request.png" alt="BindRequest state machine" width="100%"/>
+
+We have two flavors of **Bind**:
+* **Simple** bind, which uses a name and its credentials, in clear text
+* **SASL** bind, which use a name, a mechanism and some added data. A dialog will be established, in which some responses and requests will be exchanged, until the authentication is established.
+
+For a **BindRequest**, only two states are mandatory and must be followed by another state:
+
+* _VERSION_STATE_
+* _NAME_STATE_
 
-```
 
-## BindRequest message
+## AddResponse operation
 
-The _BindRequest_ message grammar is the following:
+
+
+## BindRequest operation
+
+The **BindRequest** message grammar is the following:
 
 ```
         BindRequest ::= [APPLICATION 0] SEQUENCE {
@@ -512,22 +530,20 @@ Its state machine is shown in this picture:
 <img src="images/asn1-bind-request.png" alt="BindRequest state machine" width="100%"/>
 
 We have two flavors of **Bind**:
-* Simple bind, which uses a name and its credentials, in clear text
+* **Simple** bind, which uses a name and its credentials, in clear text
 * **SASL** bind, which use a name, a mechanism and some added data. A dialog will be established, in which some responses and requests will be exchanged, until the authentication is established.
 
-For the _BindRequest_, only two states are mandatory and must be followed by another state:
+For a **BindRequest**, only two states are mandatory and must be followed by another state:
 
 * _VERSION_STATE_
 * _NAME_STATE_
 
+## BindResponse operation
 
-
-## BindResponse message
-
-The _BindResponse_ message contains two elements:
+The **BindResponse** message contains two elements:
 
 * A _LdapResult_ element 
-* An optional response used in a aunthentication dialogue, if the _BindRequest_ message was a **SASL** one
+* An optional response used in a aunthentication dialogue, if the **BindRequest** message was a **SASL** one
 
 ```
 BindResponse ::= [APPLICATION 1] SEQUENCE {
@@ -535,11 +551,11 @@ BindResponse ::= [APPLICATION 1] SEQUENCE {
              serverSaslCreds    [7] OCTET STRING OPTIONAL }
 ```
 
-The associated state machine is shwon below:
+The associated state machine is shown below:
 
 <img src="images/asn1-bind-response.png" alt="BindResponse state machine" width="100%"/>
 
-Just because we may have some data after the _LDAPResult_ element, we use a special version of the _LDAPResult_ state machine:
+Just because we may have some data after the **LDAPResult** element, we use a special version of the **LDAPResult** state machine:
 
 <img src="images/asn1-ldap-result-BR.png" alt="BindResponse LDAPResult state machine" width="100%"/>
 
@@ -549,20 +565,9 @@ In any case, two states are mandatory:
 * _MATCHED_DN_BR_STATE_
 
 
-## UnbindRequest
-
-This is the simplest operation. Its **PDU** contains only 2 bytes: **0x42 0x00**.
-
-```text
-        UnbindRequest ::= [APPLICATION 2] NULL
-```
-
-Its state machine is already fully contained in the _LDAPMEssage_ state machine, as it's encoded directly.
-
+## ModifyRequest operation
 
-## ModifyRequest
-
-The _Modify_ operation request is described by this part of the **LDAP** grammar:
+The **Modify** operation request is described by this part of the **LDAP** grammar:
 
 ```text
 ModifyRequest ::= [APPLICATION 6] SEQUENCE {
@@ -576,7 +581,7 @@ ModifyRequest ::= [APPLICATION 6] SEQUENCE {
                   modification    PartialAttribute } }
 ```
 
-With this common element, _PartialAttribute_:
+With this common element, **PartialAttribute**:
 
 ```text
 PartialAttribute ::= SEQUENCE {
@@ -584,9 +589,9 @@ PartialAttribute ::= SEQUENCE {
              vals       SET OF value OCTET STRING }
 ```
 
-(Note: the _PartialAttribute_ sub-element is shared with the _AddRequest_ and _SearchResultEntry_ message)
+(Note: the **PartialAttribute** sub-element is shared with the [**AddRequest**](#addrequest-message) and [**SearchResultEntry**](#search-result-entry) messages)
 
-The associated state machine is shwon below:
+The associated state machine is shown below:
 
 <img src="images/asn1-modify-request.png" alt="ModifyRequest state machine" width="100%"/>
 
@@ -598,9 +603,20 @@ Three states are mandatory:
 * _OPERATION_STATE_
 
 
-## ModifyResponse
+## ModifyResponse operation
+
+The **Modify** operation response is described by this part of the **LDAP** grammar:
+
+```text
+    ModifyResponse ::= [APPLICATION 7] LDAPResult
+```
+
+The associated state machine is shown below:
+
+<img src="images/asn1-modify-response.png" alt="ModifyResponse state machine" width="100%"/>
 
 
+There are no mandatory state.
 
 
 ## SearchRequest
@@ -611,10 +627,6 @@ Three states are mandatory:
 
 ## SearchResultReference
 
-## AddRequest
-
-## AddResponse
-
 ## DelRequest
 
 ## DelResponse
@@ -633,4 +645,16 @@ Three states are mandatory:
 
 ## ExtendedResponse
 
-## IntermediateResponse
\ No newline at end of file
+## IntermediateResponse
+
+## UnbindRequest operation
+
+This is the simplest operation. Its **PDU** contains only 2 bytes: **0x42 0x00**.
+
+```text
+        UnbindRequest ::= [APPLICATION 2] NULL
+```
+
+Its state machine is already fully contained in the **LDAPMEssage** state machine, as it's encoded directly.
+
+
diff --git a/static/api/internal-design-guide/images/asn1-modify-request.graphml b/static/api/internal-design-guide/images/asn1-modify-request.graphml
index 8e637cd9..285aad25 100644
--- a/static/api/internal-design-guide/images/asn1-modify-request.graphml
+++ b/static/api/internal-design-guide/images/asn1-modify-request.graphml
@@ -13,7 +13,7 @@
   <key attr.name="description" attr.type="string" for="edge" id="d9"/>
   <key for="edge" id="d10" yfiles.type="edgegraphics"/>
   <graph edgedefault="directed" id="G">
-    <data key="d0"/>
+    <data key="d0" xml:space="preserve"/>
     <node id="n0" yfiles.foldertype="folder">
       <data key="d4" xml:space="preserve"/>
       <data key="d6">
@@ -47,13 +47,13 @@
     <node id="n1">
       <data key="d6">
         <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="30.0" width="30.0" x="280.0" y="397.0"/>
+          <y:Geometry height="30.0" width="30.0" x="573.0" y="231.0"/>
           <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
           <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="150.71875" x="-161.359375" xml:space="preserve" y="5.93359375">MODIFY_REQUEST_STATE<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParamet [...]
           <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
+            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
             <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_PLAIN"/>
@@ -90,8 +90,8 @@
             </y:ModelParameter>
           </y:NodeLabel>
           <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_END"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
+            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_END"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
             <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_TERMINATE"/>
@@ -102,9 +102,9 @@
     <node id="n4">
       <data key="d6">
         <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="632.0" y="447.0"/>
+          <y:Geometry height="20.0" width="20.0" x="525.0" y="447.0"/>
           <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
+          <y:BorderStyle color="#FF0000" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
             <y:LabelModel>
               <y:SmartNodeLabelModel distance="4.0"/>
@@ -114,8 +114,8 @@
             </y:ModelParameter>
           </y:NodeLabel>
           <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
+            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
             <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
@@ -140,10 +140,10 @@
     <node id="n6">
       <data key="d6">
         <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="844.5400000000001" y="442.0"/>
+          <y:Geometry height="20.0" width="20.0" x="736.5400000000001" y="447.0"/>
           <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="7.999999999999886" y="24.0">
+          <y:BorderStyle color="#FF0000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
             <y:LabelModel>
               <y:SmartNodeLabelModel distance="4.0"/>
             </y:LabelModel>
@@ -152,8 +152,8 @@
             </y:ModelParameter>
           </y:NodeLabel>
           <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
+            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
             <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
@@ -234,9 +234,9 @@
     <node id="n12">
       <data key="d6">
         <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="1057.0800000000002" y="447.0"/>
+          <y:Geometry height="20.0" width="20.0" x="942.0799999999999" y="572.0"/>
           <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
+          <y:BorderStyle color="#FF0000" type="line" width="1.0"/>
           <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
             <y:LabelModel>
               <y:SmartNodeLabelModel distance="4.0"/>
@@ -246,32 +246,8 @@
             </y:ModelParameter>
           </y:NodeLabel>
           <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
-            <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
-          </y:StyleProperties>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n13">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="1065.08" y="565.0"/>
-          <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:StyleProperties>
             <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
             <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
             <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
@@ -279,55 +255,7 @@
         </y:GenericNode>
       </data>
     </node>
-    <node id="n14">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="632.0" y="688.0"/>
-          <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
-            <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
-          </y:StyleProperties>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n15">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="844.5400000000001" y="688.0"/>
-          <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
-            <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
-          </y:StyleProperties>
-        </y:GenericNode>
-      </data>
-    </node>
-    <node id="n16">
+    <node id="n13">
       <data key="d6">
         <y:GenericNode configuration="com.yworks.entityRelationship.big_entity">
           <y:Geometry height="60.0" width="140.0" x="518.0" y="520.0"/>
@@ -341,30 +269,6 @@
         </y:GenericNode>
       </data>
     </node>
-    <node id="n17">
-      <data key="d6">
-        <y:GenericNode configuration="com.yworks.bpmn.Event.withShadow">
-          <y:Geometry height="20.0" width="20.0" x="644.0800000000002" y="565.0"/>
-          <y:Fill color="#FFFFFFE6" color2="#D4D4D4CC" transparent="false"/>
-          <y:BorderStyle color="#DCBA00" type="line" width="1.0"/>
-          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="4.0" x="8.0" y="24.0">
-            <y:LabelModel>
-              <y:SmartNodeLabelModel distance="4.0"/>
-            </y:LabelModel>
-            <y:ModelParameter>
-              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
-            </y:ModelParameter>
-          </y:NodeLabel>
-          <y:StyleProperties>
-            <y:Property class="com.yworks.yfiles.bpmn.view.EventCharEnum" name="com.yworks.bpmn.characteristic" value="EVENT_CHARACTERISTIC_INTERMEDIATE_CATCHING"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.line.color" value="#000000"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill2" value="#d4d4d4cc"/>
-            <y:Property class="java.awt.Color" name="com.yworks.bpmn.icon.fill" value="#ffffffe6"/>
-            <y:Property class="com.yworks.yfiles.bpmn.view.BPMNTypeEnum" name="com.yworks.bpmn.type" value="EVENT_TYPE_LINK"/>
-          </y:StyleProperties>
-        </y:GenericNode>
-      </data>
-    </node>
     <edge id="e0" source="n2" target="n5">
       <data key="d10">
         <y:PolyLineEdge>
@@ -376,13 +280,13 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e1" source="n1" target="n0">
+    <edge id="e1" source="n1" target="n2">
       <data key="d10">
         <y:PolyLineEdge>
-          <y:Path sx="0.0" sy="0.0" tx="-238.1600000000003" ty="-168.0"/>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="none" target="white_delta"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="93.783203125" x="4.278778294814629" xml:space="preserve" y="-38.717819274085684">0x04 LL abcd...<y:L [...]
+          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="93.783203125" x="22.1083984375" xml:space="preserve" y="29.953369140625">0x04 LL abcd...<y:LabelMode [...]
           <y:BendStyle smoothed="false"/>
         </y:PolyLineEdge>
       </data>
@@ -420,7 +324,6 @@
       </data>
     </edge>
     <edge id="e5" source="n10" target="n11">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -432,7 +335,6 @@
       </data>
     </edge>
     <edge id="e6" source="n11" target="n11">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="-79.04443422189878" sy="16.101423063466882" tx="-32.86625442202588" ty="29.984883612639806">
@@ -448,7 +350,6 @@
       </data>
     </edge>
     <edge id="e7" source="n9" target="n10">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -459,8 +360,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e8" source="n8" target="n16">
-      <data key="d9"/>
+    <edge id="e8" source="n8" target="n13">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@@ -472,7 +372,6 @@
       </data>
     </edge>
     <edge id="e9" source="n11" target="n7">
-      <data key="d9"/>
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
@@ -486,8 +385,7 @@
         </y:PolyLineEdge>
       </data>
     </edge>
-    <edge id="e10" source="n16" target="n9">
-      <data key="d9"/>
+    <edge id="e10" source="n13" target="n9">
       <data key="d10">
         <y:PolyLineEdge>
           <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>