Merge "Fix to m2e issue"
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..0d3538d
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,5 @@
+Be warned:
+
+The root web page is defined by the "content/main.html" file, which is loaded by the main (top-level) "index.php" file.
+
+The "Downloads" page is defined by the "content/index.html" file, which is loaded by the "content/download.php" file.
\ No newline at end of file
diff --git a/content/index.html b/content/index.html
index 26dff24..03b5e56 100644
--- a/content/index.html
+++ b/content/index.html
@@ -10,36 +10,42 @@
<!-- ReleaseCheck -->
<!-- ReleaseCheck -->
- <h2>There are three ways to install Eclipse Papyrus for Real Time (Papyrus-RT):</h2>
+ <h2>There are three ways to install Eclipse Papyrus for Real Time
+ (Papyrus-RT):</h2>
<ol>
<li><em>Install the <a href="#RCP">Papyrus-RT RCP</a></em> <br />
The RCP is an all-inclusive self-contained archive (zip) of Papyrus-RT<br/>
<ul>
- <li>Pro: simple three-step: download, extract, start working with Papyrus-RT!</li>
+ <li>Pro: simple three-step: download, extract, start working with
+ Papyrus-RT!</li>
<li>Cons: larger file to download</li>
</ul>
</li>
<li><em>Using the <a href="#Installer">Papyrus-RT Installer</a></em><br />
- The Papyrus-RT installer is powered by Oomph, the same technology used by the Eclipse Installer.
- <ul>
- <li>Pros: support for bundle pooling, managed workspaces, and automatic updates</li>
- <li>Cons: You have to answers a few simple questions</li>
+ The Papyrus-RT installer is powered by Oomph, the same technology used
+ by the Eclipse Installer.
+ <ul>
+ <li>Pros: support for bundle pooling, managed workspaces, and
+ automatic updates</li>
+ <li>Cons: You have to answers a few simple questions</li>
</ul>
</li>
<li><em>Using <a href="#UpdateSites">update sites</a></em><br />
- This approach is for the Eclipse veterans who are not afraid of the Eclipse Installer, understand what we mean a "p2", and need to install Papyrus-RT with other Eclipse projects!
+ This approach is for the Eclipse veterans who are not afraid of the
+ Eclipse Installer, understand what we mean by "p2", and need to install
+ Papyrus-RT with other Eclipse projects!
<ul>
- <li>Pros: Complete control of what will be part of the installation, including other Eclipse projects!</li>
- <li>Cons: Increased complexity in the installation process with boxes to check and more questions to answer.</li>
+ <li>Pros: Complete control of what will be part of the installation, including other Eclipse projects!</li>
+ <li>Cons: Increased complexity in the installation process with boxes to check and more questions to answer.</li>
</ul>
</li>
</ol>
- <h2>Current release: Papyrus-RT 0.8.0 on Eclipse Neon
+ <h2>Current release: Papyrus-RT 0.8.0 on Eclipse Neon.1
(Recommended)</h2>
- <h3 name="RCP">Papyrus-RT all-in-one RCP</h3>
+ <h3 id="RCP">Papyrus-RT all-in-one RCP</h3>
<ul>
<li><a
@@ -53,21 +59,24 @@
macOS</a> (Gzipped Tar file; 286MB)</li>
</ul>
- <h3 name="Installer">Papyrus-RT Installer</h3>
+ <h3 id="Installer">Papyrus-RT Installer</h3>
<ul>
<li><a
href="http://download.eclipse.org/papyrus-rt/installer/updates/Papyrus-RT-Installer-linux64.tar.gz">
- Linux</a> (Gzipped Tar file; 45MB)</li>
+ Linux</a> (Gzipped Tar file; 45MB)
+ </li>
<li><a
href="http://download.eclipse.org/papyrus-rt/installer/updates/Papyrus-RT-Installer-win64.exe">
- Windows</a> (Self-extracting exe file; 46MB)</li>
+ Windows</a> (Self-extracting exe file; 46MB)
+ </li>
<li><a
href="http://download.eclipse.org/papyrus-rt/installer/updates/Papyrus-RT-Installer-mac64.zip">
- macOS</a> (Zip file; 46MB)</li>
+ macOS</a> (Zip file; 46MB)
+ </li>
</ul>
- <h3 name="UpdateSites">Update sites</h3>
+ <h3 id="UpdateSites">Update sites</h3>
<ul>
<li>Release 0.8.0 update site: <a
@@ -106,10 +115,3 @@
</ul>
</div>
-
-
-
-
-
-</div>
-
diff --git a/content/main.html b/content/main.html
index e48c1da..bbd267c 100644
--- a/content/main.html
+++ b/content/main.html
@@ -1,162 +1,189 @@
<div id="midcolumn">
- <div id="title">
- <img alt="Papyrus-RT-Logo"
- src="/papyrus-rt/content/images/Papyrus-RT-logo-full.png">
- </div>
+ <div id="title">
+ <img alt="Papyrus-RT-Logo"
+ src="/papyrus-rt/content/images/Papyrus-RT-logo-full.png"
+ >
+ </div>
- <div id="screenshot">
- <img alt="Papyrus-RT 0.8 screenshot"
- src="/papyrus-rt/content/images/Papyrus-RT-0.8-screenshot.png"
- width="800" height="620">
- </div>
+ <div id="screenshot">
+ <img alt="Papyrus-RT 0.8 screenshot"
+ src="/papyrus-rt/content/images/Papyrus-RT-0.8-screenshot.png"
+ width="800" height="620"
+ >
+ </div>
- <h3>Papyrus-RT - UML-RT modelling and code generation environment</h3>
+ <h3>Papyrus-RT - UML-RT modelling and code generation environment</h3>
- <div id="introText">
- <p>Papyrus-RT provides an implementation of the UML-RT modeling
- language together with editors, code generator for C++ and a
- supporting runtime system.</p>
- <p>
- For more details, see the <a href="/papyrus-rt/content/overview.php">
- Overview section</a>.
- </p>
- </div>
+ <div id="introText">
+ <p>Papyrus-RT provides an implementation of the UML-RT modeling
+ language together with editors, code generator for C++ and a
+ supporting runtime system.</p>
+ <p>
+ For more details, see the <a
+ href="/papyrus-rt/content/overview.php"
+ > Overview section</a>.
+ </p>
+ </div>
- <h3>Some highlights</h3>
+ <h3>Some highlights</h3>
- <div id="highlights">
- <table>
- <tr>
- <th width="45%">
- <h4>Graphical structure editor</h4>
- </th>
- <th width="10%"></th>
- <th width="45%">
- <h4>Graphical behavior editor</h4>
- </th>
- </tr>
- <tr>
- <td width="45%" valign="top">
- <p align="justify">The structure editor allows the user to edit
- capsule structure in a convenient way. It is possible to create
- and arrange capsule references and ports and to create bindings
- and layer connections.</p>
- </td>
- <td width="10%"></td>
- <td width="45%" valign="top">
- <p align="justify">The behavior editor allows the user to
- describe capsule behavior by means of a hierarchical finite state
- machine. It is possible to create and arrange states, choice
- points, junction points and transitions using the state machine
- editor.</p>
- </td>
- </tr>
- </table>
- </div>
+ <div id="highlights">
+ <table>
+ <tr>
+ <th width="45%">
+ <h4>Graphical structure editor</h4>
+ </th>
+ <th width="10%"></th>
+ <th width="45%">
+ <h4>Graphical behavior editor</h4>
+ </th>
+ </tr>
+ <tr>
+ <td width="45%" valign="top">
+ <p align="justify">The structure editor allows the user to
+ edit capsule structure in a convenient way. It is possible
+ to create and arrange capsule references and ports and to
+ create bindings and layer connections.</p>
+ </td>
+ <td width="10%"></td>
+ <td width="45%" valign="top">
+ <p align="justify">The behavior editor allows the user to
+ describe capsule behavior by means of a hierarchical finite
+ state machine. It is possible to create and arrange states,
+ choice points, junction points and transitions using the
+ state machine editor.</p>
+ </td>
+ </tr>
+ </table>
+ </div>
- <br>
+ <br>
- <div id="highlights">
- <table>
- <tr>
- <th width="45%"><h4>Code generator</h4></th>
- <th width="10%"></th>
- <th width="45%"><h4>C++ runtime services support</h4></th>
- </tr>
- <tr>
- <td width="45%" valign="top">
- <p align="justify">A code generator will translate the UML-RT
- model into C++ code. This code generator will translate all
- structural (e.g., capsules, protocols, and classes) and behavioral
- (i.e., state machines) elements into C++ code, based on their
- properties, stereotypes, stereotype properties (including those
- from a profile with properties specific to C++), and runtime
- services elements. For the generation of the behavioral C++ code
- from the state machines, the code generator will first translate
- the behavior provided by each capsule's (or passive class') state
- machine into an intermediate model that will then be translated to
- optimized code. Based on user-provided thread allocation
- information, the code generator will also allocate capsules, or
- groups of capsules, to threads.</p>
- </td>
- <td width="10%"></td>
- <td width="45%" valign="top">
- <p align="justify">The C++ Runtime Services Library provides
- support for the execution of the C++ code generated from a UML-RT
- model. Capsule lifecycle functions (incarnate, destroy, import,
- deport), message delivery and timing services are provided by the
- services library and are used by both the generated code as well
- as the user specifed action code which is part of the capsule
- behaviour. The runtime system code is distributed in source form
- as an installable Eclipse feature. The code generator produces
- both standard makefiles as well as CMakeList files to build the
- generated code.</p>
- </td>
- </tr>
- </table>
- </div>
+ <div id="highlights">
+ <table>
+ <tr>
+ <th width="45%"><h4>Code generator</h4></th>
+ <th width="10%"></th>
+ <th width="45%"><h4>C++ runtime services support</h4></th>
+ </tr>
+ <tr>
+ <td width="45%" valign="top">
+ <p align="justify">A code generator will translate the
+ UML-RT model into C++ code. This code generator will
+ translate all structural (e.g., capsules, protocols, and
+ classes) and behavioral (i.e., state machines) elements into
+ C++ code, based on their properties, stereotypes, stereotype
+ properties (including those from a profile with properties
+ specific to C++), and runtime services elements. For the
+ generation of the behavioral C++ code from the state
+ machines, the code generator will first translate the
+ behavior provided by each capsule's (or passive class')
+ state machine into an intermediate model that will then be
+ translated to optimized code. Based on user-provided thread
+ allocation information, the code generator will also
+ allocate capsules, or groups of capsules, to threads.</p>
+ </td>
+ <td width="10%"></td>
+ <td width="45%" valign="top">
+ <p align="justify">The C++ Runtime Services Library
+ provides support for the execution of the C++ code generated
+ from a UML-RT model. Capsule lifecycle functions (incarnate,
+ destroy, import, deport), message delivery and timing
+ services are provided by the services library and are used
+ by both the generated code as well as the user specifed
+ action code which is part of the capsule behaviour. The
+ runtime system code is distributed in source form as an
+ installable Eclipse feature. The code generator produces
+ both standard makefiles as well as CMakeList files to build
+ the generated code.</p>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
<div id="rightcolumn">
- <div class="sideitem">
- <h6>Incubation</h6>
- <a href="/projects/what-is-incubation.php"> <img align="middle"
- src="/images/egg-incubation.png" border="0" alt="Incubation" />
- </a>
- <p>
- This project is in the <a
- href="/projects/dev_process/incubation-phase.php">Incubation
- Phase</a>.
- </p>
- </div>
+ <div id="incubation" class="sideitem">
+ <h3>Incubation</h3>
+ <a href="/projects/what-is-incubation.php"> <img align="middle"
+ src="/images/egg-incubation.png" border="0" alt="Incubation"
+ />
+ </a>
+ <p>
+ This project is in the <a href="/projects/dev_process/incubation-phase.php"
+ >Incubation Phase</a>.
+ </p>
+ </div>
- <div>
- <h3>
- <a href="/papyrus-rt/content/download.php">Downloads</a>
- </h3>
+ <div id="quicklinks" class="sideitem">
+ <h3>Quick Links</h3>
+ <ul>
+ <li><a href="/papyrus-rt/content/download.php">Downloads</a>
+ </li>
+ <li><a href="https://wiki.eclipse.org/Papyrus-RT/Roadmap">Papyrus-RT
+ Roadmap</a></li>
+ <li><a href="https://wiki.eclipse.org/Papyrus-RT">Wiki Main page</a>
+ </li>
+ </ul>
+ </div>
- <h3>
- <a href="https://wiki.eclipse.org/Papyrus-RT">Wiki</a>
- </h3>
+ <div id="news>" class="sideitem">
- <h3>News</h3>
+ <h3>News</h3>
+ <p>
+ <b>2016-03-01</b>: Altough Papyrus-RT is not part of the Eclipse
+ Release train, we will endeavour to align with it for the next two
+ releases (as seen in the <a
+ href="https://wiki.eclipse.org/Papyrus-RT/Roadmap"
+ >Papyrus-RT Roadmap</a>):</p>
+ <ul>
+ <li><a
+ href="https://wiki.eclipse.org/Papyrus-RT/Releases#Papyrus-RT_MVP2_.28v0.9.29_-_Better_behave.21"
+ >Papyrus-RT v0.9</a> is planned to be released with Neon.3 (+4)</li>
+ <li><a
+ href="https://wiki.eclipse.org/Papyrus-RT/Releases#Papyrus-RT_MVP2.1_.28v1.0.29_-_Better_behave_with_Oxygen.21"
+ >Papyrus-RT v1.0</a> is planned to be released with Oxygen (+4)</li>
+ </ul>
- <p>
- Oct. 24, 2016: <b>Papyrus-RT 0.8.0</b> released. Get it in the <a
- href="/papyrus-rt/content/download.php">downloads</a> section. See
- also the <a
- href="https://wiki.eclipse.org/Papyrus-RT/Releases/Neon_v0.8_Release_Notes">Release
- notes</a>.
-
- <h3>History</h3>
+ <p>
+ <b>2016-10-Oct. 24, 2016</b>: <em>Papyrus-RT 0.8.0</em> released.
+ Get it in the <a href="/papyrus-rt/content/download.php">downloads</a>
+ section. See also the <a
+ href="https://wiki.eclipse.org/Papyrus-RT/Releases/Neon_v0.8_Release_Notes"
+ >Release notes</a>.
+ </p>
+ </div>
- <p>
- <b>Papyrus-RT 0.8.0</b> released October 24th, 2016.
- </p>
- <p>
- <b>Papyrus-RT 0.7.2</b> released December 15th, 2015.
- </p>
- <p>
- <b>Papyrus-RT 0.7.1</b> released October 12th, 2015.
- </p>
+ <div id="history>" class="sideitem">
+ <h3>History</h3>
- </div>
+ <p>
+ <b>Papyrus-RT 0.8.0</b> released October 24th, 2016.
+ </p>
+ <p>
+ <b>Papyrus-RT 0.7.2</b> released December 15th, 2015.
+ </p>
+ <p>
+ <b>Papyrus-RT 0.7.1</b> released October 12th, 2015.
+ </p>
+
+ </div>
- <div>
- <h3>More...</h3>
- <ul>
- <li>Read the <a
- href="https://projects.eclipse.org/projects/modeling.papyrus-rt">
- project proposal</a></li>
- <li>Join the discussions at the <a
- href="http://www.eclipse.org/forums/eclipse.Papyrus-RT">forum</a></li>
- </ul>
- </div>
-
+ <div id="more" class="sideitem">
+ <h3>More...</h3>
+ <ul>
+ <li>Read the <a
+ href="https://projects.eclipse.org/projects/modeling.papyrus-rt"
+ > project proposal</a></li>
+ <li>Join the discussions at the <a
+ href="http://www.eclipse.org/forums/eclipse.Papyrus-RT"
+ >forum</a></li>
+ </ul>
+ </div>
</div>
