Bug 491498 - [SysML 1.4][diagram] using pathmap for MDE models
- adding documentation for exporting the root plugin for pathmap access
- model modification to link to the pathmap
- adding the papyrus extension point for pathmap export
Change-Id: I470f5cb6bfc667db8565602e2aa23364c75afef1
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
diff --git a/core/org.eclipse.papyrus.sysml14/plugin.xml b/core/org.eclipse.papyrus.sysml14/plugin.xml
index 5e446bd..b9b5a9b 100644
--- a/core/org.eclipse.papyrus.sysml14/plugin.xml
+++ b/core/org.eclipse.papyrus.sysml14/plugin.xml
@@ -88,6 +88,10 @@
<mapping
source="pathmap://SysML14_PROFILES/"
target="platform:/plugin/org.eclipse.papyrus.sysml14/resources/profile/"/>
+ <mapping
+ source="pathmap://SysML14_OMG/"
+ target="platform:/plugin/org.eclipse.papyrus.sysml14/resources/doc/">
+ </mapping>
</extension>
<extension
@@ -137,6 +141,6 @@
<extension point="org.eclipse.uml2.uml.generated_package">
<profile uri="http://www.eclipse.org/papyrus/sysml/1.4/SysML"
location="pathmap://SysML14_PROFILES/SysML.profile.uml#SysML"/>
- </extension>
+ </extension>
</plugin>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.notation b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.notation
index 35c9c05..19d43b5 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.notation
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.notation
@@ -186,13 +186,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_zPFLvlCLEeWVDv-g61eepg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zPFLv1CLEeWVDv-g61eepg"/>
</children>
- <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/doc/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
+ <element xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zPEkoVCLEeWVDv-g61eepg" x="60" y="20" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_zPai4FCLEeWVDv-g61eepg" type="StereotypeComment">
<styles xmi:type="notation:TitleStyle" xmi:id="_zPai4VCLEeWVDv-g61eepg" showTitle="true"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_zPai41CLEeWVDv-g61eepg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/doc/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
+ <eObjectValue xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
</styles>
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zPai4lCLEeWVDv-g61eepg" x="200"/>
@@ -224,7 +224,7 @@
<edges xmi:type="notation:Connector" xmi:id="_zPai5FCLEeWVDv-g61eepg" type="StereotypeCommentLink" source="_zPEkoFCLEeWVDv-g61eepg" target="_zPai4FCLEeWVDv-g61eepg">
<styles xmi:type="notation:FontStyle" xmi:id="_zPai5VCLEeWVDv-g61eepg"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_zPbJ8FCLEeWVDv-g61eepg" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/doc/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
+ <eObjectValue xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
</styles>
<element xsi:nil="true"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zPai5lCLEeWVDv-g61eepg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.uml b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.uml
index a2e136b..4387919 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.uml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml14.diagram.blockdefinition.uml
@@ -4,9 +4,6 @@
<packageImport xmi:type="uml:PackageImport" xmi:id="_OFsfceLIEeSv5dwvZ9NSDw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_qUP-sFCLEeWVDv-g61eepg">
- <importedPackage xmi:type="uml:Model" href="../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_d7ALQDqsEeWNg8WvR7UDoQ"/>
- </packageImport>
<packagedElement xmi:type="uml:Model" xmi:id="_OFsfcuLIEeSv5dwvZ9NSDw" name="Requirements">
<ownedComment xmi:type="uml:Comment" xmi:id="_dICO8Oc2EeSLdPGe2q9R0g">
<body>This package will contains all graphical requirements for Sysml elements contained int he Block package and displayed in the BDD diagram</body>
@@ -15,29 +12,29 @@
<packagedElement xmi:type="uml:Class" xmi:id="_lLZBYOc2EeSLdPGe2q9R0g" name="The block can display constraints "/>
<packagedElement xmi:type="uml:Class" xmi:id="_SnnPoB_KEeWp9rJ2gmw59A" name="FlowPortCompartment"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_3etN0FCLEeWVDv-g61eepg" client="_a0GrwOLIEeSv5dwvZ9NSDw">
- <supplier xmi:type="uml:Class" href="../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_13F9sGauEeWv7P_h5u3SSw" name="FlowSpecification"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_14bacGauEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-C.3.1.2 FlowSpecification" client="_13F9sGauEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66bUujq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66bUujq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_rHmEMGalEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-16.3.2.5 TestCase" client="_rFDGgGalEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_2AL-YGalEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-16.3.2.5 TestCase" client="_2AKJMGalEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_26IeIGalEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-16.3.2.5 TestCase" client="_26HQAGalEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_3n9NcGalEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-16.3.2.5 TestCase" client="_3n7_UGalEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_4VvggGalEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-16.3.2.5 TestCase" client="_4VuSYGalEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_5JBXkGalEeWv7P_h5u3SSw" name="DeriveFrom_REQ-OMG-SYSML14-16.3.2.5 TestCase" client="_5JAJcGalEeWv7P_h5u3SSw">
- <supplier xmi:type="uml:Class" href="../../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/resources/doc/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
+ <supplier xmi:type="uml:Class" href="pathmap://SysML14_OMG/omg.sysml.uml#_66XDTzq8EeW79ofuztDyTA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_9sBksI3hEeWA_aqQQ02JeA" name="Allocate"/>
<packagedElement xmi:type="uml:Class" xmi:id="_9sBksY3hEeWA_aqQQ02JeA" name="Allocated"/>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
index 1a9f541..1928b9f 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.1.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.1.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.1.3,2.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[1.1.0,2.0.0)",
org.eclipse.papyrus.uml.tools;bundle-version="[1.1.0,2.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.1.0,2.0.0)",
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml
index 06c7ef3..0629b03 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.xml
@@ -57,4 +57,13 @@
</factory>
</extension>
+ <extension
+ point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
+ <library
+ description="SysML 1.4 OMG Library"
+ name="SysML 1.4 OMG"
+ path="pathmap://SysML14_OMG/omg.sysml.uml">
+ </library>
+ </extension>
+
</plugin>
diff --git a/src/site/xdoc/developer/index.xml b/src/site/xdoc/developer/index.xml
index ace7cfa..089c10c 100644
--- a/src/site/xdoc/developer/index.xml
+++ b/src/site/xdoc/developer/index.xml
@@ -104,6 +104,7 @@
<p>If you are working with multiple version of Papyrus, it is possible that Tycho do not pull the right one. You can force it by using the following parameter in the build command.
More details <a href="https://wiki.eclipse.org/Tycho/Target_Platform#Locally_built_artifacts">here</a></p>
<source>mvn clean install -Dtycho.localArtifacts=ignore </source>
+ <p>Please find additional information here: <a href="miscellaneous.html">Miscellaneous</a></p>
</subsection>
</section>
diff --git a/src/site/xdoc/developer/miscellaneous.xml b/src/site/xdoc/developer/miscellaneous.xml
index e33e403..b5832fc 100644
--- a/src/site/xdoc/developer/miscellaneous.xml
+++ b/src/site/xdoc/developer/miscellaneous.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
- <title>SysML - Tools Generation Standard Operating Procedure</title>
+ <title>SysML - Miscellaneous</title>
</properties>
<body>
diff --git a/src/site/xdoc/developer/sop3-upgradingNorm.xml b/src/site/xdoc/developer/sop3-upgradingNorm.xml
index de912e8..40a6fcf 100644
--- a/src/site/xdoc/developer/sop3-upgradingNorm.xml
+++ b/src/site/xdoc/developer/sop3-upgradingNorm.xml
@@ -23,6 +23,12 @@
<p>Add your requirements here by creating a new derive requirement with Papyrus Req plugin:
/org.eclipse.papyrus.sysml14/doc/org.eclipse.papyrus.sysml14.di
</p>
+ <p>You should export the org.eclipse.papyrus.sysml14 plugin to have access to the pathmap for the different UML models, such as:</p>
+ <ul>
+ <li>OMG norm: resources/doc/omg.sysml.uml</li>
+ <li>MDE model: resources/doc/org.eclipse.papyrus.sysml14.uml</li>
+ <li>SysML 1.4 extension model: resources/doc/SysML-Extension.uml</li>
+ </ul>
</subsection>
<subsection name="SysML profile: semantic upgrade">
<p>Modify
