Update from internal repository

config/_default/config.toml

@@ -26,7 +26,7 @@ theme = "academic"
 diagram = true
 
 # Due to some problems with Eclipse Jenkins we raised the timeout for page generation
-timeout = "300s"
+timeout = 300000
 
 # Get last modified date for content from Git?
 enableGitInfo = false

config/_default/menus.toml

@@ -30,10 +30,15 @@
   name = "Download"
   url = "/download/"
   weight = 50
+[[main]]
+  identifier = "Commercial"
+  name = "Commercial"
+  url = "/commercial/"
+  weight = 60
 [[main]]
   name = "Community"
   url = "/community/"
-  weight = 60
+  weight = 70
 
 
 [[footer]]

content/commercial/index.md

@@ -0,0 +1,6 @@
+---
+title: "Commercial"  # Add a page title.
+summary: "List of links to download the latest releases and other components."  # Add a page description.
+date: "2019-01-01T00:00:00Z"  # Add today's date.
+type: "widget_page"  # Page type is a Widget Page
+---

content/download/overview.md → content/commercial/overview.md

@@ -39,9 +39,13 @@ includes all simulators and tools we think are most valuable for research purpos
 features in our **MOSAIC Extended** version, which includes all open-source elements of Eclipse MOSAIC and additional tools for scenario
 preparation and visualization. For commercial users we even provide additional simulators, such as the vehicle simulation **PHABMACS**.
 
+If you are interested in MOSAIC Extended please leave us a message at [email protected] and we will
+create an individual offer suitable to your needs.
+
+
 |               | *Feature*                                                                     |              {{< img src="/img/logos/mosaic/EclipseMOSAIC-Logo-RGB-positiv.svg" width="220px" >}}               | {{< img src="/img/logos/mosaic/MOSAICExtended-Logo-RGB-positiv.svg" width="220px" >}} |
 |:--------------|:------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------:|:-----------:|
-|               | **License Type**                                                              | Open Source <br> [EPL 2.0](https://www.eclipse.org/legal/epl-2.0/)<br>[**Attribution required**](/publications) | Commercial* |
+|               | **License Type**                                                              | Open Source <br> [EPL 2.0](https://www.eclipse.org/legal/epl-2.0/)<br>[**Attribution required**](/publications) | Commercial |
 |               |                                                                               |                                                                                                                 |             ||| 
 |               | **[Runtime Infrastructure](/docs/extending_mosaic)**                          |                                                      **✓**                                                      |    **✓**    |
 |               | **[Interactions Library](/docs/extending_mosaic/interactions)**               |                                                      **✓**                                                      |    **✓**    |
@@ -68,12 +72,8 @@ preparation and visualization. For commercial users we even provide additional s
 | *Tools*       |                                                                               |                                                                                                                 |             ||| 
 |               | **[Command Line Tool](/docs/getting_started/run_mosaic)**                     |                                                      **✓**                                                      |    **✓**    |
 |               | **Run Federates in Docker**                                                   |                                                      **✓**                                                      |    **✓**    |
-|               | **[scenario-convert](/docs/scenarios/scenario_convert)**                      |                                                      (✓)**                                                      |    **✓**    |
+|               | **[scenario-convert](/docs/scenarios/scenario_convert)**                      |                                                      (✓)*                                                     |    **✓**    |
 |               | **[Simulation Runner](docs/scenarios/run_simulation_series)**                 |                                                        -                                                        |    **✓**    |
 |               | **TrafficGen**                                                                |                                                        -                                                        |    **✓**    |
 
-*) For the commercial version of MOSAIC Extended please leave us a message at [email protected] and we will
-create an individual offer suitable to your needs.
-
-**) **scenario-convert** is not part of the open-source version of Eclipse MOSAIC, but can be freely used and downloaded
-from the link on top.
+*) **scenario-convert** is not part of the open-source version of Eclipse MOSAIC, but can be freely used.

content/commercial/page_header.md

@@ -0,0 +1,14 @@
++++
+widget = "page_header" # Costum Mosaic feature
+headless = true  # This file represents a page section.
+active = true  # Activate this widget? true/false
+weight = 1  # Order that this section will appear.
+
+title = "MOSAIC Extended"
+subtitle = "Expand you simulation tools<br>by valuable components"
+
+[design.background]
+  image = "background-home-02.jpg"
+  image_opacity = "0.4"
+
++++

content/docs/simulators/network_simulator_omnetpp.md

@@ -29,12 +29,11 @@ For more information on the **INET** extension you should look closer on the [we
 
 ## Installation
 
-While we recommend GNU/Linux platforms for installing OMNeT++, the official project provides an Windows installation based on mingw.
+The official project provides an Windows installation based on mingw, but we don't support this in our setup. 
 
-Beside mingw for Windows you might consider
+If you use Windows, please consider
 - the installation in [Docker environment](#installation-in-docker-environment)
-- the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/)
-- the installation of Linux in a virtual machine environment, such as
+- the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/) or the installation of Linux in a virtual machine environment, such as
   {{< target-blank "VMware" "https://www.vmware.com/products/workstation-player.html" >}} or {{< target-blank "VirtualBox" "https://www.virtualbox.org/" >}}.
 
 We prepared an installation script, which manages most of the required work. The script provides two installation types
@@ -44,7 +43,7 @@ the following options are possible:
 | Type                                                               | Description                     |
 |:------------------------------------------------------------------ |:------------------------------- |
 | [USER](#installation-for-users)<br>(installation script)           | This installation type addresses those who only want to use the **OMNeT++** network simulator for simulations.<br>Network configurations can also be adjusted.<br><br>If you install the federate with this installation type, **OMNeT++ {{< version of="omnetpp" >}}** and **INET {{< version of="inet" >}}** will automatically be installed inside `<mosaic>/bin/fed/omnetpp` during the installation. |
-| [DEVELOPER](#installation-for-developers)<br>(installation script) | The installation for developers addresses those who want to make changes or extend the MOSAIC OMNeT++ Federate.<br><br>This installation type awaits that **OMNeT++ {{< version of="omnetpp" >}}** and **INET {{< version of="inet" >}}** are already installed on your system and<br>- `PATH` contains `/path/to/omnetpp/bin`<br>- `LD_LIBRARY_PATH` contains `/path/to/omnetpp/lib` and `/path/to/inet/src`<br>- `C_INCLUDE_PATH` contains `/path/to/omnetpp/include` and `/path/to/inet/src` |
+| [DEVELOPER](#installation-for-developers)<br>(installation script) | The installation for developers addresses those who want to make changes or extend the MOSAIC OMNeT++ Federate.<br><br>This installation type awaits that **OMNeT++ {{< version of="omnetpp" >}}** is already installed on your system and<br>- `PATH` contains `/path/to/omnetpp/bin`<br>- `LD_LIBRARY_PATH` contains `/path/to/omnetpp/lib` |
 | [Docker](#installation-in-docker-environment)                      | This installation type addresses those who only want to use the **OMNeT++** network simulator for simulations.<br>Network configurations can also be adjusted.<br><br>If you install the federate with this installation type, **OMNeT++ {{< version of="omnetpp" >}}** and **INET {{< version of="inet" >}}** will automatically be installed bundled as a Docker image. |
 | manual installation                                                | This type addresses developers. You can install and build everything manually without the use of the installer script. See [Extending MOSAIC OMNeT++ Federate](/docs/extending_mosaic/omnetpp_details) for details on federate build process. |
 
@@ -94,7 +93,7 @@ Run the installation script (this takes a few minutes):
 ```bash
 cd <mosaic>/bin/fed/omnetpp
 chmod +x omnet_installer.sh`
-./omnet_install.sh \
+./omnet_installer.sh \
     --installation-type USER \
     --omnetpp /path/to/omnetpp-{{< version of="omnetpp" >}}-src.tgz \
     --inet /path/to/inet-{{< version of="inet" >}}-src.tgz \
@@ -106,15 +105,29 @@ The installation script should terminate with `SUCESS: The MOSAIC OMNeT++ Federa
 
 ### Installation for Developers
 
+Install OMNeT++ and add the correct paths:
+
+```bash
+cd ~
+tar xvfz omnetpp-5.5.1-src-linux.tgz
+cd omnetpp-5.5.1
+source setenv
+vim ~/.bashrc
+    # export PATH=$HOME/omnetpp-5.5.1/bin:$PATH
+    # export LD_LIBRARY_PATH=$HOME/omnetpp-5.5.1/lib
+./configure WITH_TKENV=no WITH_QTENV=no WITH_OSG=no  WITH_OSGEARTH=no WITH_PARSIM=no
+make
+```
+
 Run the installation script (this takes a few minutes):
 ```bash
 cd <mosaic>/bin/fed/omnetpp
 chmod +x omnet_installer.sh`
-./omnet_install.sh \
+./omnet_installer.sh \
     --installation-type DEVELOPER \
     --federate /path/to/omnetpp-federate-{{< version of="mosaic" >}}.zip
 ```
-For the installation type `DEVELOPER` the parameter `-f` is required. The installation script should terminate with `SUCCESS: The MOSAIC OMNeT++ Federate was successfully installed.` otherwise the installation failed.
+The installation script should terminate with `SUCCESS: The MOSAIC OMNeT++ Federate was successfully installed.` otherwise the installation failed.
 
 Please continue reading [here](/docs/extending_mosaic/omnetpp_details) for more details on setting up a development environment for the OMNeT++ federate.
 

content/download/download_button.md

@@ -0,0 +1,21 @@
++++
+widget = "text_image"  # See https://sourcethemes.com/academic/docs/page-builder/
+headless = true  # This file represents a page section.
+active = true  # Activate this widget? true/false
+weight = 5  # Order that this section will appear in.
+
+title = ""
++++
+
+<div class="row">
+	<div class="col"></div>
+	<div class="col-5">
+		<div class="row">
+            <p class="text-center">Click below to get the bundled version of the latest release of Eclipse&nbsp;MOSAIC and additional components.</p>            
+			<a class="mosaic-btn mosaic-btn-primary" style="margin-right:0; text-align: center;" href="https://www.dcaiti.tu-berlin.de/research/simulation/download/" download>
+				<i class='fa fa-download' aria-hidden='true'></i><span>Download Eclipse MOSAIC from DCAITI Mirror</span>
+			</a>
+		</div>
+	</div>
+	<div class="col"></div>
+</div>

content/download/page_header.md

@@ -5,14 +5,10 @@ active = true  # Activate this widget? true/false
 weight = 1  # Order that this section will appear.
 
 title = "Download Eclipse MOSAIC"
-subtitle = "Get the latest version of Eclipse&nbsp;MOSAIC<br>from our partners at DCAITI:"
+subtitle = "Get the latest version of Eclipse&nbsp;MOSAIC<br>from our partners at DCAITI"
 
 [design.background]
   image = "background-home-02.jpg"
   image_opacity = "0.4"
-
-[[button]]
-  title = "<i class='fa fa-download' aria-hidden='true'></i><span>Download Eclipse MOSAIC from DCAITI Mirror</span>"
-  url = "https://www.dcaiti.tu-berlin.de/research/simulation/download/"
 
 +++

content/tutorials/workshop-setup/index.md

@@ -0,0 +1,39 @@
+---
+# Documentation: https://sourcethemes.com/academic/docs/managing-content/
+
+title: "Workshop Setup - Link Collection"
+subtitle: "Below you find links to the software used in our workshops."
+summary: ""
+authors: []
+tags: []
+categories: []
+date: 2024-10-30T09:48:20+01:00
+lastmod: 2024-10-30T09:48:20+01:00
+featured: false
+draft: false
+
+# Featured image
+# To use, add an image named `featured.jpg/png` to your page's folder.
+# Focal points: Smart, Center, TopLeft, Top, TopRight, Left, Right, BottomLeft, Bottom, BottomRight.
+image:
+  caption: ""
+  focal_point: ""
+  preview_only: false
+
+# Projects (optional).
+#   Associate this post with one or more of your projects.
+#   Simply enter your project's folder or file name without extension.
+#   E.g. `projects = ["internal-project"]` references `content/project/deep-learning/index.md`.
+#   Otherwise, set `projects = []`.
+# projects: []
+---
+
+## Download Links 
+- [Java {{< version of="java_recommended" >}}](https://adoptium.net/de/temurin/releases?version={{< version of="java_recommended" >}})
+- [Maven version {{<version of = "maven">}}](https://dlcdn.apache.org/maven/{{<version of = "maven_major_release">}}/{{<version of = "maven">}}/binaries/apache-maven-{{<version of = "maven">}}-bin.zip)
+- [IntelliJ (Community Edition)](https://download.jetbrains.com/idea/ideaIC-2024.2.4.exe)
+- [Eclipse SUMO](https://eclipse.dev/sumo/)
+  - [Windows Installer](https://sumo.dlr.de/releases/{{< version of="sumo" >}}/sumo-win64-{{< version of="sumo" >}}.msi)
+  - [MacOS Installer](https://sumo.dlr.de/docs/Downloads.php#macos)
+- [Eclipse MOSAIC Source Code (version {{<version of = "mosaic">}})](https://github.com/eclipse/mosaic/archive/refs/tags/{{<version of = "mosaic">}}.zip)
+- [MOSAIC Extended (version {{<version of = "mosaic">}})](https://www.dcaiti.tu-berlin.de/research/simulation/extended/) (User licence required)

data/mosaic.toml

@@ -20,6 +20,10 @@ serverRootDir = "/mosaic"
     java_no_support = "10 and below"
     java_limited_support = "above 18"
 
+    # Maven
+    maven = "3.9.9"
+    maven_major_release = "maven-3"
+
     # SUMO
     sumo = "1.20.0"
     sumo_no_support = "0.32.0 and below"
@@ -46,3 +50,4 @@ serverRootDir = "/mosaic"
     ns3_not_tested = "above 3.36.1"
     ns3_docker = "1.13"
     ns3_protobuf = "3.3.0"
+

themes/academic/layouts/partials/li_changelog.html

@@ -4,22 +4,14 @@
 {{ $link := $item.RelPermalink }}
 
 <div class="changelog-item view-list-item row">
-  <div class="col-4">
+  <div class="col-lg-2"></div>
+  <div class="col-6 col-lg-4">
     {{ $date := dateFormat "2006 Jan 02" $item.Params.date }}
     <span class="date">{{ $date }}</span>
     <span class="dash">&nbsp;&mdash;&nbsp;</span>
     <a class="name" href="{{$link}}">{{ $item.Params.release.name }}</a>
   </div>
-  <div class="col">
+  <div class="col-6">
     <span class="title">{{ $item.Title }}</span>
   </div>
-  <div class="col text-end">
-    <a href="{{$link}}">
-      <i class="fas fa-info-circle pub-icon" aria-hidden="true"></i>&nbsp;More details
-    </a>
-    &nbsp;&nbsp;&nbsp;
-    <a href="{{ $item.Params.release.github_url | safeHTMLAttr }}" target="_blank" rel="noopener">
-      <i class="fab fa-github pub-icon" aria-hidden="true"></i>&nbsp;Download
-    </a>
-  </div>
 </div>