Skip to content

Commit

Permalink
Updated Obeo, Sirius, adn Capella links.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ylussaud
ylussaud committed Oct 23, 2023
1 parent 4df2058 commit c863349
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
<p>Made with &#10084; Copyright &copy; <span id="year">YEAR</span> <a href="https://www.obeo.fr">Obeo</a> - All Rights Reserved</p>
<p>Made with &#10084; Copyright &copy; <span id="year">YEAR</span> <a href="https://www.obeosoft.com">Obeo</a> - All Rights Reserved</p>
</div>
</div>
</div>
Expand All @@ -15,15 +15,15 @@


<!-- Cookies Consent/RGPD -->
<script type="text/javascript" src="https://www.obeo.fr/templates/purity_iii/js/ihavecookies.min.js"></script>
<script type="text/javascript" src="https://www.obeosoft.com/templates/purity_iii/js/ihavecookies.min.js"></script>
<script>
jQuery(document).ready(function () {
jQuery('body').ihavecookies({
title: 'Accept Cookies & Privacy Policy',
message: 'This website uses cookies to ensure you get the best experience on our website. By clicking "Accept" or by closing this pop-up, you consent to our cookies in accordance with our Cookies and Privacy Polyicy.',
delay: 1000,
expires: 30,
link: 'https://www.obeo.fr/en/legal-information',
link: 'https://www.obeosoft.com/en/legal-information',
onAccept: function () {
location.reload();
},
Expand All @@ -35,7 +35,7 @@
if (document.cookie.indexOf('cookieControl') > -1) {
var sc = document.createElement('script');

sc.src = "https://www.obeo.fr/templates/purity_iii/js/js.cookie.js";
sc.src = "https://www.obeosoft.com/templates/purity_iii/js/js.cookie.js";
sc.type = 'application/javascript';

document.getElementsByTagName('head')[0].appendChild(sc);
Expand Down
10 changes: 5 additions & 5 deletions capella/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Generation is driven by templates that navigate through a source model and trans

![Generated document.]({{page.relativePath}}/capella/images/m2doc-capella.png "Generated document.")

This tutorial explains how to install and launch two templates written for [Capella](https://www.eclipse.org/capella/) models:
This tutorial explains how to install and launch two templates written for [Capella](https://mbse-capella.org/) models:

* [LA](https://github.com/ObeoNetwork/Capella-Extensions/raw/master/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/LA-Complete-template.docx): Logical specification of a system ([generated document](https://github.com/ObeoNetwork/Capella-Extensions/raw/master/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/LA-Complete-expected-generation.docx))
* [SA](https://github.com/ObeoNetwork/Capella-Extensions/raw/master/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/SA-Complete-template.docx): Whole specification of a system ([generated document](https://github.com/ObeoNetwork/Capella-Extensions/raw/master/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/SA-Complete-expected-generation.docx))
Expand All @@ -29,11 +29,11 @@ You can also replay this webinar which explains how to launch M2Doc from Capella
<iframe height="350" width="600" src="https://www.youtube.com/embed/tnLDinb0jkg?start=970"></iframe>


Note: M2Doc 1.1.0 and above are compatible with [Team for Capella](https://www.obeo.fr/en/capella-professional-offer). You can test the generation by sharing the IFE example project provided in the extensions. Then edit the .genconf file to reference the shared SystemEngineering model element. You might need to open the Capella session first by double clicking the .aird file.
Note: M2Doc 1.1.0 and above are compatible with [Team for Capella](https://www.obeosoft.com/en/capella-professional-offer). You can test the generation by sharing the IFE example project provided in the extensions. Then edit the .genconf file to reference the shared SystemEngineering model element. You might need to open the Capella session first by double clicking the .aird file.

# Installation

First you need to download [Capella](https://www.eclipse.org/capella/). It can be downloaded from this [download page](https://www.eclipse.org/capella/download.html).
First you need to download [Capella](https://mbse-capella.org/). It can be downloaded from this [download page](https://mbse-capella.org/download.html).

Once your download is finished, extract the downloaded archive and run the eclipe executable in the eclipse sub folder. You are now ready for the last step of the installation. You will need to [add a new update site](https://help.eclipse.org/mars/index.jsp?topic=%2Forg.eclipse.platform.doc.user%2Ftasks%2Ftasks-127.htm):

Expand Down Expand Up @@ -80,7 +80,7 @@ Once your download is finished, extract the downloaded archive and run the eclip

* `https://obeo-networkaggregation-releases.s3-website-eu-west-1.amazonaws.com/capella-extensions/1.1.0/full` [zip](https://s3-eu-west-1.amazonaws.com/obeo-networkaggregation-releases/capella-extensions/1.1.0/full/org.obeonetwork.capella.update.full.zip) (M2Doc 1.0.0)

This update site contains [M2Doc](https://m2Doc.org) and the [Capella](https://www.eclipse.org/capella/) integration. Select the following feature:
This update site contains [M2Doc](https://m2Doc.org) and the [Capella](https://mbse-capella.org/) integration. Select the following feature:

![The feature to install.]({{page.relativePath}}/capella/images/Install.png "The feature to install.")

Expand Down Expand Up @@ -128,7 +128,7 @@ The validation button will only be enable if the selected value is compatible wi

# Team for Capella

You can also use M2Doc with [Team for Capella](https://www.obeo.fr/en/capella-professional-offer). If you had existing .genconf files before you shared your project to Team for Capella, you will need to edit them.
You can also use M2Doc with [Team for Capella](https://www.obeosoft.com/en/capella-professional-offer). If you had existing .genconf files before you shared your project to Team for Capella, you will need to edit them.

First you need to change the SiriusSession since the .aird file has been renamed. You should need to add "team" like this:

Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h2>Contributors</h2>
<a href="https://www.lassuranceretraite.fr/portail-info/accueil" target="_blank"><img src="images/logos/sponsors/logo-cnav.png" alt="" /></a>
</div>
<div class="col-md-2 center">
<a href="http://www.obeo.fr/" target="_blank"><img src="images/logos/sponsors/logo-obeo.png" alt="" /></a>
<a href="https://www.obeosoft.com" target="_blank"><img src="images/logos/sponsors/logo-obeo.png" alt="" /></a>
</div>
<div class="col-md-2 center">
<a href="http://www.defense.gouv.fr/" target="_blank"><img src="images/logos/sponsors/logo-ministere_armee.png" alt="" /></a>
Expand All @@ -103,7 +103,7 @@ <h2>Contributors</h2>
<h2>Missing a feature?</h2>
<p>You can contribute too!</p>
<br/>
<p><a href="https://www.obeo.fr/fr/contact" class="btn btn-default btn-lg">Sponsor new features</a></p>
<p><a href="https://www.obeosoft.com/fr/contact" class="btn btn-default btn-lg">Sponsor new features</a></p>
</div>
</div><!-- /.row -->
</div><!-- /.container -->
Expand Down
6 changes: 3 additions & 3 deletions ref-doc/nightly/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ The next page of the wizard is dedicated to variables and binding values to them

To reference new values you can load new resources using the `Load resource` button. Note the `Options (expert)` tab that allow to set advanced options to find values from a Sirius session for instance.

If you are using M2Doc with [Sirius](https://www.eclipse.org/sirius/), [Obeo Designer](https://www.obeodesigner.com/en/), [Obeo Designer Team](https://www.obeodesigner.com/en/collaborative-features), [Capella](https://www.eclipse.org/capella/), or [Team for Capella](https://www.obeo.fr/en/capella-professional-offer), you need to set the SiriusSession option. This will allow you to use [Sirius services](index.html#services) like exporting diagrams as images:
If you are using M2Doc with [Sirius](https://www.eclipse.dev/sirius/), [Obeo Designer](https://www.obeodesigner.com/en/), [Obeo Designer Team](https://www.obeodesigner.com/en/collaborative-features), [Capella](https://mbse-capella.org/), or [Team for Capella](https://www.obeosoft.com/en/capella-professional-offer), you need to set the SiriusSession option. This will allow you to use [Sirius services](index.html#services) like exporting diagrams as images:

![SiriusSession Option.]({{page.relativePath}}/capella/images/SiriusSession%20Option.png "SiriusSession Option.")

Expand All @@ -175,7 +175,7 @@ Setting this option should allow you to select model elements for each model var

When the `Finish` button is pushed the generation configuration file is created or edited.

You can also use M2Doc with [Team for Capella](https://www.obeo.fr/en/capella-professional-offer) or [Obeo Designer Team](https://www.obeodesigner.com/en/collaborative-features). If you had existing .genconf files before you shared your project to Team for Capella or Obeo Designer Team, you will need to edit them.
You can also use M2Doc with [Team for Capella](https://www.obeosoft.com/en/capella-professional-offer) or [Obeo Designer Team](https://www.obeodesigner.com/en/collaborative-features). If you had existing .genconf files before you shared your project to Team for Capella or Obeo Designer Team, you will need to edit them.

First you need to change the SiriusSession since the .aird file has been renamed. You should need to add "team" like this:

Expand Down Expand Up @@ -542,7 +542,7 @@ When the class has no explicit constructor or the constructor doesn&#8217;t have

When there is an explicit constructor with at least a parameter M2Doc can&#8217;t instantiate your class since there is no default constructor. You need to implement the [IServicesConfigurator](https://github.com/ObeoNetwork/M2Doc/blob/master/plugins/org.obeonetwork.m2doc/src/org/obeonetwork/m2doc/services/configurator/IServicesConfigurator.java) interface. This interface link one or more options in the generation configuration to the service class in order to instantiate it. You need to use the org.obeonetwork.m2doc.ide.servicesConfigurator extension point to declare your implementation of [IServicesConfigurator](https://github.com/ObeoNetwork/M2Doc/blob/master/plugins/org.obeonetwork.m2doc/src/org/obeonetwork/m2doc/services/configurator/IServicesConfigurator.java). If you want to use your implementation in standalone you can register it programmatically using M2DocUtils.registerServicesConfigurator().

An example of implementation can be found in the [Sirius](https://eclipse.org/sirius/) integration plug-in see the class [SiriusServiceConfigurator](https://github.com/ObeoNetwork/M2Doc/blob/master/plugins/org.obeonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/configurator/SiriusServiceConfigurator.java) and the extension in the [plugin.xml](https://github.com/ObeoNetwork/M2Doc/blob/master/plugins/org.obeonetwork.m2doc.sirius/plugin.xml).
An example of implementation can be found in the [Sirius](https://www.eclipse.dev/sirius/) integration plug-in see the class [SiriusServiceConfigurator](https://github.com/ObeoNetwork/M2Doc/blob/master/plugins/org.obeonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/configurator/SiriusServiceConfigurator.java) and the extension in the [plugin.xml](https://github.com/ObeoNetwork/M2Doc/blob/master/plugins/org.obeonetwork.m2doc.sirius/plugin.xml).

### Special return types

Expand Down
12 changes: 6 additions & 6 deletions support/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ <h2 class="center">Professional Support</h2>

<div class="row">
<div class="col-lg-4 col-md-4 center">
<h3><a href="http://www.obeo.fr/en/contact" target="_blank"><i class="fa fa-graduation-cap"></i> Training</a></h3>
<p>Improve your skills on Eclipse Modeling technologies (EMF, Sirius, Acceleo) thanks to <a href="http://www.obeo.fr/en/contact" target="_blank">Obeo</a>'s training programs.
<h3><a href="https://www.obeosoft.com/en/contact" target="_blank"><i class="fa fa-graduation-cap"></i> Training</a></h3>
<p>Improve your skills on Eclipse Modeling technologies (EMF, Sirius, Acceleo) thanks to <a href="https://www.obeosoft.com/en/contact" target="_blank">Obeo</a>'s training programs.
</p>
</div>

<div class="col-lg-4 col-md-4 center">
<h3><a href="http://www.obeo.fr/en/contact" target="_blank"><i class="fa fa-users"></i> Consulting & Coaching</a></h3>
<p>Get the best of M2Doc, thanks to <a href="http://www.obeo.fr/en/contact" target="_blank">Obeo</a> expertise on AQL, POI, Sirius and Eclipse Modeling technologies.
<h3><a href="https://www.obeosoft.com/en/contact" target="_blank"><i class="fa fa-users"></i> Consulting & Coaching</a></h3>
<p>Get the best of M2Doc, thanks to <a href="https://www.obeosoft.com/en/contact" target="_blank">Obeo</a> expertise on AQL, POI, Sirius and Eclipse Modeling technologies.
</p>
</div>

<div class="col-lg-4 col-md-4 center">
<h3><a href="http://www.obeo.fr/en/contact" target="_blank"><i class="fa fa-code"></i> Custom Development</a></h3>
<p>Entrust us with your development projects to benefit from <a href="http://www.obeo.fr/en/contact" target="_blank">Obeo</a>'s expertise on Eclipse Modeling technologies.</p>
<h3><a href="https://www.obeosoft.com/en/contact" target="_blank"><i class="fa fa-code"></i> Custom Development</a></h3>
<p>Entrust us with your development projects to benefit from <a href="https://www.obeosoft.com/en/contact" target="_blank">Obeo</a>'s expertise on Eclipse Modeling technologies.</p>
</div>
</div><!-- /.row -->
</div><!-- /.container -->
Expand Down

0 comments on commit c863349

Please sign in to comment.