Refactor Maven Project Structure

- Convert client/, common/ and server/ to modules
- Add parent pom.xml
- Update templates and workflow
- Remove old documentation

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,7 +4,8 @@ about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: CyB3RC0nN0R, delvh, DieGurke, derharry333
-
+projects: Envoy
+milestone: Envoy v0.2-beta
 ---
 
 **Describe the bug**
@@ -24,15 +25,8 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
+ - OS: [e.g. Debian GNU/Linux, Microsoft Windows 10]
- - Browser [e.g. chrome, safari]
+ - Version [e.g. 0.1-beta]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,8 +5,7 @@ title: ''
 labels: enhancement, feature
 assignees: CyB3RC0nN0R, delvh, DieGurke
 project: Envoy
-milestones: Envoy v0.3-alpha
+milestones: Envoy v0.2-beta
-
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/PULL_REQUEST_TEMPLATE/bugfix.md

@@ -6,6 +6,5 @@ assignees: CyB3RC0nN0R, delvh, DieGurke
 reviewers: CyB3RC0nN0R, delvh
 projects: Envoy
 milestone: Envoy v0.1-beta
-
 ---
 Fixes #{issue}

.github/PULL_REQUEST_TEMPLATE/feature_integration.md

@@ -6,5 +6,4 @@ assignees: CyB3RC0nN0R, delvh, DieGurke
 reviewers: CyB3RC0nN0R, delvh
 projects: Envoy
 milestone: Envoy v0.1-beta
-
 ---

.github/workflows/maven.yml

@@ -3,7 +3,8 @@ name: Java CI
 on: [push]
 
 jobs:
-  build:
+  build-server:
+    name: Build Server
     runs-on: ubuntu-latest
 
     steps:
@@ -19,10 +20,8 @@ jobs:
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package -pl server -am
-    - name: Stage build artifacts
-      run: mkdir staging && cp target/*.jar staging
     - uses: actions/upload-artifact@v1
       with:
-        name: envoy-client-artifacts
+        name: envoy-server
-        path: staging
+        path: server/target/envoy-server-jar-with-dependencies.jar

.gitignore

@@ -0,0 +1 @@
+target/

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>envoy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Informatik-AG
+Copyright (c) 2019-2020 Informatik-AG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

client/CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at kske@outlook.de. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

client/CONTRIBUTING.md

@@ -1,161 +0,0 @@
-# Contributing to Envoy
-
-Looking to contribute something to Envoy? **Here's how you can help.**
-
-Please take a moment to review this document in order to make the contribution
-process easy and effective for everyone involved.
-
-Following these guidelines helps to communicate that you respect the time of
-the developers managing and developing this open source project. In return,
-they should reciprocate that respect in addressing your issue or assessing
-patches and features.
-
-
-## Using the issue tracker
-
-The [issue tracker](https://github.com/informatik-ag-ngl/envoy-client/issues) is
-the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
-and [submitting pull requests](#pull-requests), but please respect the following
-restrictions:
-
-* Please **do not** derail or troll issues. Keep the discussion on topic and
-  respect the opinions of others.
-
-* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
-  Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
-  instead. We reserve the right to delete comments which violate this rule.
-  
-  However, as we know, we are all software engineers that like being funny hence doing it on purpose. Please also refrain from that kind of behaviour.
-
-## Issues and labels
-
-Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
-
-- `Documentation` & `Javadoc`- Issues regarding the documentation of Envoy
-- `Enhancement` & `Feature` - Issues suggesting a new feature
-- `Maven` - Issues concerned with Maven problems
-- `Bug` - Issues concerned with a general bug
-
-For a complete look at our labels, see the [project labels page](https://github.com/informatik-ag-ngl/envoy-client/labels).
-
-## Bug reports
-
-A bug is a _demonstrable problem_ that is caused by the code in the repository.
-Good bug reports are extremely helpful, so thanks!
-
-Guidelines for bug reports:
-
-0. **ensure your problem isn't caused by a simple error in your own code**.
-
-1. **Use the GitHub issue search** — check if the issue has already been
-   reported.
-
-2. **Check if the issue has been fixed** — try to reproduce it using the
-   latest `master` or development branch in the repository.
-
-3. **Isolate the problem** — ideally create a reduced test
-   case and a live example.
-
-
-A good bug report shouldn't leave others needing to chase you up for more
-information. Please try to be as detailed as possible in your report. What is
-your environment? What steps will reproduce the issue? These details will help people to fix
-any potential bugs.
-
-Example:
-
-> Short and descriptive example bug report title
->
-> 1. This is the first step
-> 2. This is the second step
-> 3. Further steps, etc.
->
-> Any other information you want to share that is relevant to the issue being
-> reported. This might include the lines of code that you have identified as
-> causing the bug, and potential solutions (and your opinions on their
-> merits).
-
-## Feature requests
-
-Feature requests are welcome. But take a moment to find out whether your idea
-fits with the scope and aims of the project. It's up to *you* to make a strong
-case to convince the project's developers of the merits of this feature. Please
-provide as much detail and context as possible.
-
-
-## Pull requests
-
-Good pull requests—patches, improvements, new features—are a fantastic
-help. They should remain focused in scope and avoid containing unrelated
-commits.
-
-**Please ask first** before embarking on any significant pull request (e.g.
-implementing features, refactoring code, porting to a different language),
-otherwise you risk spending a lot of time working on something that the
-project's developers might not want to merge into the project.
-
-Please adhere to the [coding guidelines](#code-guidelines) used throughout the
-project (indentation, accurate comments, etc.) and any other requirements
-(such as test coverage).
-
-Adhering to the following process is the best way to get your work
-included in the project:
-
-1. Download, clone or [Fork](https://help.github.com/articles/fork-a-repo/) the project, using [https://github.com/informatik-ag-ngl/envoy-client/](https://github.com/informatik-ag-ngl/envoy-client/)as Remote.
-
-2. If you cloned a while ago, get the latest changes from upstream:
-
-   ```bash
-   git checkout master
-   git pull upstream master
-   ```
-   Or, if your IDE of choice supports this, simply use `pull`
-
-3. Create a new topic branch (off the main project development branch) to
-   contain your feature, change, or fix:
-
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
-   Or, simply use "New branch" if your IDE supports this
-
-4. Commit your changes in logical chunks. Please adhere to these [git commit
-   message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-   or your code is unlikely be merged into the main project. Use Git's
-   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
-   feature to tidy up your commits before making them public.
-
-5. Locally merge (or rebase) the upstream development branch into your topic branch:
-
-   ```bash
-   git pull [--rebase] upstream master
-   ```
-
-6. Push your topic branch up to your fork:
-
-   ```bash
-   git push origin <topic-branch-name>
-   ```
-
-7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
-    with a clear title and description against the `master` branch.
-
-**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
-license your work under the terms of the [MIT License](../LICENSE) (if it
-includes code changes) and under the terms of the
-[Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/)
-(if it includes documentation changes).
-
-
-## Code guidelines
-
-### Java
-
-Please use the formatter provided with this project. Especially before saving. For best results, select the option "format code" in the "Save Actions" tab in Preferences in Eclipse, so that you never accidentally forget it.
-Every public function (not annotated with `@Override`) must be delivered with Javadoc. For best project-appropriate Javadoc please take a look at the other functions which are all already equipped with Javadoc.
-
-
-## License
-
-By contributing your code, you agree to license your contribution under the [MIT License](../LICENSE).
-By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).

client/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Informatik-AG (NGL)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

client/README.md

@@ -1,38 +0,0 @@
-# Envoy Client
-
-<a href="https://github.com/informatik-ag-ngl/envoy-client"><img src="https://raw.githubusercontent.com/informatik-ag-ngl/envoy-client/develop/src/main/resources/icons/envoy_logo.png" align="left" width="200" height="200"></a>
-
-**Envoy Client** is one of two repositories needed to use the messenger Envoy.<br>
-The other one is <a href="https://github.com/informatik-ag-ngl/envoy-common">**Envoy Common**</a>.
-<br><br><br><br><br><br><br><br><br>
-
-## Features
-
-Envoy Client features a lot of things and many more are yet to come.
-Currently existing features are:
-
-* Users
-  * Saving and loading of messages
-  * Login via name
-  * Settings to change the behavior of _Envoy_
-* UI
-  * Appealing user interface
-  * Changeable themes that store the colors used in _Envoy_
-  * Possibility to run _Envoy_ in the Background once it has been started
-    * Possibility to exit _Envoy_
-* Connectivity
-  * Sending messages to another person via a predefined server
-  * Offline mode
-* Programming
-  * API to change default configuration
-  * Advanced logging possibilities
-  * Access without Admin rights possible via local message storage in the home folder
-  * Tons of Events to interact with
-  * Detailed Javadoc to improve readability of code
-  
-## Resources
-
-* [API Reference (later on)](https://github.com/informatik-ag-ngl/envoy-client/wiki)
-* [Release Notes](https://github.com/informatik-ag-ngl/envoy-client/releases)
-* [Gallery (later on)](https://github.com/informatik-ag-ngl/envoy-client/wiki/Gallery)
-* [Wiki](https://github.com/informatik-ag-ngl/envoy-client/wiki)

client/pom.xml

@@ -3,32 +3,20 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>informatik-ag-ngl</groupId>
 	<artifactId>envoy-client</artifactId>
-	<version>0.1-beta</version>
-
 	<name>Envoy Client</name>
-	<url>https://github.com/informatik-ag-ngl/envoy-client</url>
 
-	<properties>
+	<parent>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<groupId>informatik-ag-ngl</groupId>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<artifactId>envoy</artifactId>
-		<maven.compiler.source>11</maven.compiler.source>
+		<version>0.1-beta</version>
-		<maven.compiler.target>11</maven.compiler.target>
+	</parent>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
-	</repositories>
 
 	<dependencies>
 		<dependency>
-			<groupId>com.github.informatik-ag-ngl</groupId>
+			<groupId>informatik-ag-ngl</groupId>
 			<artifactId>envoy-common</artifactId>
-			<version>develop-SNAPSHOT</version>
+			<version>0.1-beta</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjfx</groupId>
@@ -40,18 +28,6 @@
 			<artifactId>javafx-fxml</artifactId>
 			<version>11.0.2</version>
 		</dependency>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-graphics </artifactId>
-			<version>11</version>
-			<classifier>win</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-graphics </artifactId>
-			<version>11</version>
-			<classifier>linux</classifier>
-		</dependency>
 	</dependencies>
 
 	<build>

client/src/main/java/envoy/client/ui/controller/ChatScene.java

@@ -377,7 +377,7 @@ public final class ChatScene implements Restorable {
 	private void doABarrelRoll() {
 		// contains all Node objects in ChatScene in alphabetical order
 		final var	rotatableNodes	= new Node[] { attachmentButton, attachmentView, contactLabel, infoLabel, messageList, messageTextArea,
-				postButton, remainingChars, rotateButton, scene, settingsButton, userList, voiceButton };
+				postButton, remainingChars, rotateButton, scene, settingsButton, chatList, voiceButton };
 		final var	random			= new Random();
 		for (final var node : rotatableNodes) {
 			// Defines at most four whole rotation in at most 4s

common/.github/CODEOWNERS

@@ -1 +0,0 @@
-* @CyB3RC0nN0R

common/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: CyB3RC0nN0R, delvh
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

common/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: CyB3RC0nN0R, delvh
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

common/.github/PULL_REQUEST_TEMPLATE/bugfix.md

@@ -1,10 +0,0 @@
----
-name: Bug fix
-title: Fixed Bug
-labels: bug
-assignees: CyB3RC0nN0R, delvh, DieGurke
-reviewers: CyB3RC0nN0R, delvh
-projects: Envoy
-milestone: Envoy v0.3-alpha
----
-Fixes #{issue}

common/.github/PULL_REQUEST_TEMPLATE/feature_integration.md

@@ -1,9 +0,0 @@
----
-name: Feature integration
-title: Added feature
-labels: enhancement
-assignees: CyB3RC0nN0R, delvh, DieGurke
-reviewers: CyB3RC0nN0R, delvh
-projects: Envoy
-milestone: Envoy v0.3-alpha
----

common/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md

@@ -1,9 +0,0 @@
----
-name: Updated Javadoc 
-title: Updated Javadoc
-labels: documentation
-assignees: CyB3RC0nN0R, delvh
-reviewers: CyB3RC0nN0R, delvh
-projects: Envoy
-milestone: Envoy v0.3-alpha
----

common/.github/workflows/maven.yml

@@ -1,17 +0,0 @@
-name: Java CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml

common/CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at kske@outlook.de. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

common/CONTRIBUTING.md

@@ -1,161 +0,0 @@
-# Contributing to Envoy
-
-Looking to contribute something to Envoy? **Here's how you can help.**
-
-Please take a moment to review this document in order to make the contribution
-process easy and effective for everyone involved.
-
-Following these guidelines helps to communicate that you respect the time of
-the developers managing and developing this open source project. In return,
-they should reciprocate that respect in addressing your issue or assessing
-patches and features.
-
-
-## Using the issue tracker
-
-The [issue tracker](https://github.com/informatik-ag-ngl/envoy-common/issues) is
-the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
-and [submitting pull requests](#pull-requests), but please respect the following
-restrictions:
-
-* Please **do not** derail or troll issues. Keep the discussion on topic and
-  respect the opinions of others.
-
-* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
-  Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
-  instead. We reserve the right to delete comments which violate this rule.
-  
-  However, as we know, we are all software engineers that like being funny hence doing it on purpose. Please also refrain from that kind of behaviour.
-
-## Issues and labels
-
-Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
-
-- `Documentation` & `Javadoc`- Issues regarding the documentation of Envoy
-- `Enhancement` & `Feature` - Issues suggesting a new feature
-- `Maven` - Issues concerned with Maven problems
-- `Bug` - Issues concerned with a general bug
-
-For a complete look at our labels, see the [project labels page](https://github.com/informatik-ag-ngl/envoy-common/labels).
-
-## Bug reports
-
-A bug is a _demonstrable problem_ that is caused by the code in the repository.
-Good bug reports are extremely helpful, so thanks!
-
-Guidelines for bug reports:
-
-0. **ensure your problem isn't caused by a simple error in your own code**.
-
-1. **Use the GitHub issue search** — check if the issue has already been
-   reported.
-
-2. **Check if the issue has been fixed** — try to reproduce it using the
-   latest `master` or development branch in the repository.
-
-3. **Isolate the problem** — ideally create a reduced test
-   case and a live example.
-
-
-A good bug report shouldn't leave others needing to chase you up for more
-information. Please try to be as detailed as possible in your report. What is
-your environment? What steps will reproduce the issue? These details will help people to fix
-any potential bugs.
-
-Example:
-
-> Short and descriptive example bug report title
->
-> 1. This is the first step
-> 2. This is the second step
-> 3. Further steps, etc.
->
-> Any other information you want to share that is relevant to the issue being
-> reported. This might include the lines of code that you have identified as
-> causing the bug, and potential solutions (and your opinions on their
-> merits).
-
-## Feature requests
-
-Feature requests are welcome. But take a moment to find out whether your idea
-fits with the scope and aims of the project. It's up to *you* to make a strong
-case to convince the project's developers of the merits of this feature. Please
-provide as much detail and context as possible.
-
-
-## Pull requests
-
-Good pull requests—patches, improvements, new features—are a fantastic
-help. They should remain focused in scope and avoid containing unrelated
-commits.
-
-**Please ask first** before embarking on any significant pull request (e.g.
-implementing features, refactoring code, porting to a different language),
-otherwise you risk spending a lot of time working on something that the
-project's developers might not want to merge into the project.
-
-Please adhere to the [coding guidelines](#code-guidelines) used throughout the
-project (indentation, accurate comments, etc.) and any other requirements
-(such as test coverage).
-
-Adhering to the following process is the best way to get your work
-included in the project:
-
-1. Download, clone or [Fork](https://help.github.com/articles/fork-a-repo/) the project, using [https://github.com/informatik-ag-ngl/envoy-common/](https://github.com/informatik-ag-ngl/envoy-common/)as Remote.
-
-2. If you cloned a while ago, get the latest changes from upstream:
-
-   ```bash
-   git checkout master
-   git pull upstream master
-   ```
-   Or, if your IDE of choice supports this, simply use `pull`
-
-3. Create a new topic branch (off the main project development branch) to
-   contain your feature, change, or fix:
-
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
-   Or, simply use "New branch" if your IDE supports this
-
-4. Commit your changes in logical chunks. Please adhere to these [git commit
-   message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-   or your code is unlikely be merged into the main project. Use Git's
-   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
-   feature to tidy up your commits before making them public.
-
-5. Locally merge (or rebase) the upstream development branch into your topic branch:
-
-   ```bash
-   git pull [--rebase] upstream master
-   ```
-
-6. Push your topic branch up to your fork:
-
-   ```bash
-   git push origin <topic-branch-name>
-   ```
-
-7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
-    with a clear title and description against the `master` branch.
-
-**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
-license your work under the terms of the [MIT License](../LICENSE) (if it
-includes code changes) and under the terms of the
-[Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/)
-(if it includes documentation changes).
-
-
-## Code guidelines
-
-### Java
-
-Please use the formatter provided with this project. Especially before saving. For best results, select the option "format code" in the "Save Actions" tab in Preferences in Eclipse, so that you never accidentally forget it.
-Every public function (not annotated with `@Override`) must be delivered with Javadoc. For best project-appropriate Javadoc please take a look at the other functions which are all already equipped with Javadoc.
-
-
-## License
-
-By contributing your code, you agree to license your contribution under the [MIT License](../LICENSE).
-By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).

common/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Informatik-AG (NGL)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

common/README.md

@@ -1,25 +0,0 @@
-# Envoy Common
-
-<a href="https://github.com/informatik-ag-ngl/envoy-client"><img src="https://raw.githubusercontent.com/informatik-ag-ngl/envoy-client/develop/src/main/resources/icons/envoy_logo.png" align="left" width="200" height="200"></a>
-
-**Envoy Common** is a library required to build the client and server of the messenger Envoy.<br>
-<br><br><br><br><br><br><br>
-
-## Features
-
-Envoy Common consists of all classes that are used both on client side and the server side, thus making them "common".
-Currently used features are:
-
-* Messages
-* Users
-  * LoginCredentials
-* Logging
-* Event System
-* EnvoyException
-  
-## Resources
-
-* [API Reference (later on)](https://github.com/informatik-ag-ngl/envoy-common/wiki)
-* [Release Notes](https://github.com/informatik-ag-ngl/envoy-common/releases)
-* [Gallery (later on)](https://github.com/informatik-ag-ngl/envoy-common/wiki/Gallery)
-* [Wiki](https://github.com/informatik-ag-ngl/envoy-common/wiki)

common/pom.xml

@@ -2,19 +2,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>informatik-ag-ngl</groupId>
 	<artifactId>envoy-common</artifactId>
-	<version>0.1-beta</version>
 
 	<name>Envoy Common</name>
-	<url>https://github.com/informatik-ag-ngl/envoy-common</url>
 
-	<properties>
+	<parent>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<groupId>informatik-ag-ngl</groupId>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<artifactId>envoy</artifactId>
-		<maven.compiler.source>11</maven.compiler.source>
+		<version>0.1-beta</version>
-		<maven.compiler.target>11</maven.compiler.target>
+	</parent>
-	</properties>
 
 	<dependencies>
 		<dependency>
@@ -25,10 +21,10 @@
 	</dependencies>
 	<build>
 		<finalName>envoy-common</finalName>
-		
+
 		<!-- Disable resource folder -->
 		<resources />
-		
+
 		<pluginManagement>
 			<plugins>
 				<plugin>

pom.xml

@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>informatik-ag-ngl</groupId>
+	<artifactId>envoy</artifactId>
+	<version>0.1-beta</version>
+	<packaging>pom</packaging>
+
+	<name>Envoy</name>
+	<url>https://github.com/informatik-ag-ngl/envoy</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+	</properties>
+
+	<modules>
+		<module>common</module>
+		<module>client</module>
+		<module>server</module>
+	</modules>
+</project>

server/.github/CODEOWNERS

@@ -1 +0,0 @@
-* @CyB3RC0nN0R

server/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: CyB3RC0nN0R, delvh, DieGurke, derharry333
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

server/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: CyB3RC0nN0R, delvh, DieGurke
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

server/.github/PULL_REQUEST_TEMPLATE/bugfix.md

@@ -1,10 +0,0 @@
----
-name: Bug fix
-title: Fixed Bug
-labels: bug
-assignees: CyB3RC0nN0R, delvh, DieGurke
-reviewers: CyB3RC0nN0R, delvh
-projects: Envoy
-milestone: Envoy v0.3-alpha
----
-Fixes #{issue}

server/.github/PULL_REQUEST_TEMPLATE/feature_integration.md

@@ -1,9 +0,0 @@
----
-name: Feature integration
-title: Added feature
-labels: enhancement
-assignees: CyB3RC0nN0R, delvh, DieGurke
-reviewers: CyB3RC0nN0R, delvh
-projects: Envoy
-milestone: Envoy v0.3-alpha
----

server/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md

@@ -1,9 +0,0 @@
----
-name: Updated Javadoc 
-title: Updated Javadoc
-labels: documentation
-assignees: CyB3RC0nN0R, delvh
-reviewers: CyB3RC0nN0R, delvh
-projects: Envoy
-milestone: Envoy v0.3-alpha
----

server/.github/workflows/maven.yml

@@ -1,17 +0,0 @@
-name: Java CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml

server/.github/workflows/stale.yml

@@ -1,22 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "0 0 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'Stale issue message'
-        stale-pr-message: 'Stale pull request message'
-        stale-issue-label: 'no-issue-activity'
-        days-before-stale: 60
-        days-before-close: 7
-        stale-pr-label: 'no-pr-activity'
-        operations-per-run: 30

server/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +1,4 @@
 activeProfiles=
 eclipse.preferences.version=1
-resolveWorkspaceProjects=false
+resolveWorkspaceProjects=true
 version=1

server/CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at kske@outlook.de. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

server/CONTRIBUTING.md

@@ -1,161 +0,0 @@
-# Contributing to Envoy
-
-Looking to contribute something to Envoy? **Here's how you can help.**
-
-Please take a moment to review this document in order to make the contribution
-process easy and effective for everyone involved.
-
-Following these guidelines helps to communicate that you respect the time of
-the developers managing and developing this open source project. In return,
-they should reciprocate that respect in addressing your issue or assessing
-patches and features.
-
-
-## Using the issue tracker
-
-The [issue tracker](https://github.com/informatik-ag-ngl/envoy-server-standalone/issues) is
-the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
-and [submitting pull requests](#pull-requests), but please respect the following
-restrictions:
-
-* Please **do not** derail or troll issues. Keep the discussion on topic and
-  respect the opinions of others.
-
-* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
-  Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
-  instead. We reserve the right to delete comments which violate this rule.
-  
-  However, as we know, we are all software engineers that like being funny hence doing it on purpose. Please also refrain from that kind of behaviour.
-
-## Issues and labels
-
-Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
-
-- `Documentation` & `Javadoc`- Issues regarding the documentation of Envoy
-- `Enhancement` & `Feature` - Issues suggesting a new feature
-- `Maven` - Issues concerned with Maven problems
-- `Bug` - Issues concerned with a general bug
-
-For a complete look at our labels, see the [project labels page](https://github.com/informatik-ag-ngl/envoy-server-standalone/labels).
-
-## Bug reports
-
-A bug is a _demonstrable problem_ that is caused by the code in the repository.
-Good bug reports are extremely helpful, so thanks!
-
-Guidelines for bug reports:
-
-0. **ensure your problem isn't caused by a simple error in your own code**.
-
-1. **Use the GitHub issue search** — check if the issue has already been
-   reported.
-
-2. **Check if the issue has been fixed** — try to reproduce it using the
-   latest `master` or development branch in the repository.
-
-3. **Isolate the problem** — ideally create a reduced test
-   case and a live example.
-
-
-A good bug report shouldn't leave others needing to chase you up for more
-information. Please try to be as detailed as possible in your report. What is
-your environment? What steps will reproduce the issue? These details will help people to fix
-any potential bugs.
-
-Example:
-
-> Short and descriptive example bug report title
->
-> 1. This is the first step
-> 2. This is the second step
-> 3. Further steps, etc.
->
-> Any other information you want to share that is relevant to the issue being
-> reported. This might include the lines of code that you have identified as
-> causing the bug, and potential solutions (and your opinions on their
-> merits).
-
-## Feature requests
-
-Feature requests are welcome. But take a moment to find out whether your idea
-fits with the scope and aims of the project. It's up to *you* to make a strong
-case to convince the project's developers of the merits of this feature. Please
-provide as much detail and context as possible.
-
-
-## Pull requests
-
-Good pull requests—patches, improvements, new features—are a fantastic
-help. They should remain focused in scope and avoid containing unrelated
-commits.
-
-**Please ask first** before embarking on any significant pull request (e.g.
-implementing features, refactoring code, porting to a different language),
-otherwise you risk spending a lot of time working on something that the
-project's developers might not want to merge into the project.
-
-Please adhere to the [coding guidelines](#code-guidelines) used throughout the
-project (indentation, accurate comments, etc.) and any other requirements
-(such as test coverage).
-
-Adhering to the following process is the best way to get your work
-included in the project:
-
-1. Download, clone or [Fork](https://help.github.com/articles/fork-a-repo/) the project, using [https://github.com/informatik-ag-ngl/envoy-server-standalone/](https://github.com/informatik-ag-ngl/envoy-server-standalone/)as Remote.
-
-2. If you cloned a while ago, get the latest changes from upstream:
-
-   ```bash
-   git checkout master
-   git pull upstream master
-   ```
-   Or, if your IDE of choice supports this, simply use `pull`
-
-3. Create a new topic branch (off the main project development branch) to
-   contain your feature, change, or fix:
-
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
-   Or, simply use "New branch" if your IDE supports this
-
-4. Commit your changes in logical chunks. Please adhere to these [git commit
-   message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-   or your code is unlikely be merged into the main project. Use Git's
-   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
-   feature to tidy up your commits before making them public.
-
-5. Locally merge (or rebase) the upstream development branch into your topic branch:
-
-   ```bash
-   git pull [--rebase] upstream master
-   ```
-
-6. Push your topic branch up to your fork:
-
-   ```bash
-   git push origin <topic-branch-name>
-   ```
-
-7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
-    with a clear title and description against the `master` branch.
-
-**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
-license your work under the terms of the [MIT License](../LICENSE) (if it
-includes code changes) and under the terms of the
-[Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/)
-(if it includes documentation changes).
-
-
-## Code guidelines
-
-### Java
-
-Please use the formatter provided with this project. Especially before saving. For best results, select the option "format code" in the "Save Actions" tab in Preferences in Eclipse, so that you never accidentally forget it.
-Every public function (not annotated with `@Override`) must be delivered with Javadoc. For best project-appropriate Javadoc please take a look at the other functions which are all already equipped with Javadoc.
-
-
-## License
-
-By contributing your code, you agree to license your contribution under the [MIT License](../LICENSE).
-By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).

server/README.md

@@ -1,3 +0,0 @@
-# envoy-server-standalone
-Standalone server for the 
-<a href="https://github.com/informatik-ag-ngl/envoy-client"><img src="https://raw.githubusercontent.com/informatik-ag-ngl/envoy-client/develop/src/main/resources/icons/envoy_logo.png" align="left" width="200" height="200">Envoy project</a>

server/pom.xml

@@ -3,19 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>informatik-ag-ngl</groupId>
+	<artifactId>envoy-server</artifactId>
-	<artifactId>envoy-server-standalone</artifactId>
-	<version>0.1-beta</version>
-
 	<name>Envoy Server</name>
-	<url>https://github.com/informatik-ag-ngl/envoy-server-standalone</url>
 
-	<properties>
+	<parent>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<groupId>informatik-ag-ngl</groupId>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<artifactId>envoy</artifactId>
-		<maven.compiler.source>11</maven.compiler.source>
+		<version>0.1-beta</version>
-		<maven.compiler.target>11</maven.compiler.target>
+	</parent>
-	</properties>
 
 	<repositories>
 		<repository>
@@ -26,9 +21,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.github.informatik-ag-ngl</groupId>
+			<groupId>informatik-ag-ngl</groupId>
 			<artifactId>envoy-common</artifactId>
-			<version>develop-SNAPSHOT</version>
+			<version>0.1-beta</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.informatik-ag-ngl</groupId>
@@ -48,7 +43,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>envoy-server-standalone</finalName>
+		<finalName>envoy-server</finalName>
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>