Skip to content

Commit

Permalink
add changes for the OpenTOSCA fork
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Harzenetter <[email protected]>
  • Loading branch information
lharzenetter committed Jan 12, 2023
1 parent fe7b0e0 commit 3a9473e
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 7 deletions.
16 changes: 14 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<!-- describe the changes you have made here: what, why, ... -->
Use the following template for the PR title and delete this line: [WIP] Title of the thesis/work/target

- [ ] Ensure that you followed our [toolchain guide](https://github.com/eclipse/winery/blob/main/docs/dev/github-workflow.md#github---prepare-final-pull-request). Especially, we require **a single commit**
<!-- Replace this placeholder by a short description of the aim -->

- Start and end date: <!-- 2017-01-01 to 2017-08-01 -->
- Contributor: <!-- full name plus GitHub name -- e.g., Lukas Harzenetter, @lharzenetter -->
- Supervisor: <!-- full name plus GitHub name -- e.g., Karoline Saatkamp, @saatkamp -->

<!--
Replace this placeholder by a short description of the current state. What is done? What are the next steps?
Please update this description regularly.
-->

- [ ] Ensure that you followed our [toolchain guide](https://github.com/eclipse/winery/blob/master/docs/dev/github-workflow.md#github---prepare-final-pull-request).
- [ ] Branch name checked. That means, the branch name starts with `thesis/`, `fix/`, ...
- [ ] Ensure that the commit message is [a good commit message](https://github.com/joelparkerhenderson/git_commit_message)
- [ ] Ensure to use auto format in **all** files
- [ ] Ensure that you appear in `NOTICE` at Copyright Holders
Expand Down
6 changes: 3 additions & 3 deletions LICENSE.spdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPDXVersion: SPDX-2.1
PackageName: Eclipse Winery
PackageOriginator: Eclipse Foundation
PackageHomePage: https://github.com/ecipse/winery
PackageName: OpenTOSCA Winery
PackageOriginator: University of Stuttgart
PackageHomePage: https://github.com/OpenTOSCA/winery
PackageLicenseDeclared: Apache-2.0 OR EPL-2.0
32 changes: 30 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Eclipse Winery
# Eclipse Winery – OpenTOSCA fork

[![License](https://img.shields.io/badge/License-EPL%202.0-blue.svg)](https://opensource.org/licenses/EPL-2.0)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
Expand All @@ -7,6 +7,9 @@
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/4f342f5d0f534d84b40f2fe5143f412e)](https://www.codacy.com/gh/OpenTOSCA/winery/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=OpenTOSCA/winery&amp;utm_campaign=Badge_Grade)
[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/4f342f5d0f534d84b40f2fe5143f412e)](https://www.codacy.com/gh/OpenTOSCA/winery/dashboard?utm_source=github.com&utm_medium=referral&utm_content=OpenTOSCA/winery&utm_campaign=Badge_Coverage)

This is a fork of [Eclipse Winery](https://github.com/eclipse/winery) and might include current research results not yet approved by Eclipse legal.
Find out more about the OpenTOSCA eco system at [www.opentosca.org](http://www.opentosca.org/).

Winery is a web-based environment to graphically model TOSCA topologies and plans managing these topologies.
It is an Eclipse project and thus support is available through its project page <https://eclipse.org/winery>.
Winery is also part of the OpenTOSCA ecosystem where more information is available at <http://www.opentosca.org>.
Expand All @@ -17,7 +20,6 @@ There was no software security check of Eclipse Winery in the past.
There might be [remote code execution vulnerabilities](https://github.com/mbechler/marshalsec).
Thus, when hosting Eclipse Winery, make it accessible to trustworthy parties only.


## Getting Started

Both development and user documentation is available at <https://eclipse.github.io/winery>.
Expand All @@ -26,6 +28,32 @@ The source for the documentation can be found in the [docs](docs) directory.
## Video

[![](docs/user/figures/video.png)](https://youtu.be/hj7iBadt7D8)
## Differences to Eclipse Winery

The branch `ustutt` differs from eclipse/winery in the following files:

- [.github/PULL_REQUEST_TEMPLATE.md](.github/PULL_REQUEST_TEMPLATE.md) - extended for USTUTT students
- [README.md](README.md) - This text file + disclaimer
- [LICENSE.spdx](LICENSE.spdx) - Update OpenTOSCA specifics

One can find out the differences between the `ustutt` branch of OpenTOSCA/winery and the `master` branch of eclipse/winery by executing the following command:

git fetch --all
git difftool upstream/master origin/ustutt

Precondition:

git remote add upstream https://github.com/eclipse/winery.git

## Haftungsausschluss

Dies ist ein Forschungsprototyp.
Die Haftung für entgangenen Gewinn, Produktionsausfall, Betriebsunterbrechung, entgangene Nutzungen, Verlust von Daten und Informationen, Finanzierungsaufwendungen sowie sonstige Vermögens- und Folgeschäden ist, außer in Fällen von grober Fahrlässigkeit, Vorsatz und Personenschäden ausgeschlossen.

## Disclaimer of Warranty

Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.

## Acknowledgements

Expand Down

0 comments on commit 3a9473e

Please sign in to comment.