Skip to content

Commit

Permalink
Unify license statements at markdown files
Browse files Browse the repository at this point in the history
Signed-off-by: Oliver Kopp <kopp.dev@gmail.com>
  • Loading branch information
koppor committed Aug 31, 2017
1 parent 5851d5d commit 548ac25
Show file tree
Hide file tree
Showing 14 changed files with 147 additions and 109 deletions.
19 changes: 7 additions & 12 deletions docs/dev/CodeHeaders.md
Expand Up @@ -24,22 +24,17 @@ This file explains how to create and maintain copyright headers in source files.
* Student: John Smith
* Copyright (c) 2013 John Smith (University of Stuttgart).

# Full information
## Full information

Full information is available at: http://www.eclipse.org/legal/copyrightandlicensenotice.php

# License
Copyright (c) 2014 University of Stuttgart.
## License

Copyright (c) 2013-2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v10.html
and http://www.apache.org/licenses/LICENSE-2.0

Contributors:
* Oliver Kopp - initial API and implementation

and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
8 changes: 5 additions & 3 deletions docs/dev/Encoding.md
Expand Up @@ -56,7 +56,9 @@ Summary: Because the namespace is part of the used URIs and the ns itself is a U

Copyright (c) 2017 University of Stuttgart.

All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution.
All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
8 changes: 5 additions & 3 deletions docs/dev/RepositoryLayout.md
Expand Up @@ -110,7 +110,9 @@ The local name is sufficient as the namespace is given by the parent directory.

Copyright (c) 2013-2017 University of Stuttgart.

All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution.
All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
11 changes: 3 additions & 8 deletions docs/dev/RepositoryUI.md
Expand Up @@ -55,12 +55,7 @@ Copyright (c) 2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v10.html
and http://www.apache.org/licenses/LICENSE-2.0
and the [Apache License v2.0] which both accompany this distribution.

Contributors:
* Lukas Harzentter - initial API and implementation

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
11 changes: 11 additions & 0 deletions docs/dev/ToolChain.md
Expand Up @@ -123,3 +123,14 @@ For that, create a pull request to https://github.com/opentosca/winery to enable
![ExcursusGit](graphics/ExcursusGit.png)

[gitk]: https://lostechies.com/joshuaflanagan/2010/09/03/use-gitk-to-understand-git/

## License

Copyright (c) 2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
7 changes: 4 additions & 3 deletions docs/dev/angular-ui.md
Expand Up @@ -74,6 +74,7 @@ Copyright (c) 2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v10.html
and http://www.apache.org/licenses/LICENSE-2.0
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
13 changes: 4 additions & 9 deletions docs/dev/config/Eclipse/README.md
Expand Up @@ -62,16 +62,11 @@ Copy `winery.properties` to `path-to-workspace\.metadata\.plugins\org.eclipse.ws

## License

Copyright (c) 2012-2014 University of Stuttgart.
Copyright (c) 2012-2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v10.html
and http://www.apache.org/licenses/LICENSE-2.0
and the [Apache License v2.0] which both accompany this distribution.

Contributors:
* Oliver Kopp - initial API and implementation

[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
13 changes: 11 additions & 2 deletions docs/dev/config/IntelliJ IDEA/README.md
@@ -1,5 +1,3 @@
---
---
# IntelliJ Configuration

Preparation: Generate a war to have all dependencies fetched by maven: `mvn package`
Expand Down Expand Up @@ -41,3 +39,14 @@ Preparation: Generate a war to have all dependencies fetched by maven: `mvn pack
- 2x <kbd>Shift</kbd> / <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd> / <kbd>Ctrl</kbd>+<kbd>F</kbd>: Differrent forms of search
- <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>O</kbd>: Organize imports (fixes checkstyle)
- <kbd>Ctrl</kbd>+<kbd>X</kbd>: if nothing is marked: delete line and free space

## License

Copyright (c) 2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
10 changes: 6 additions & 4 deletions docs/user/DASpecification.md
Expand Up @@ -15,9 +15,11 @@ As a result, arbitrary middleware can be injected and the respective driver is u

## License

Copyright (c) 2013-2017 University of Stuttgart.
Copyright (c) 2017 University of Stuttgart.

All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution.
All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
10 changes: 6 additions & 4 deletions docs/user/Splitting.md
Expand Up @@ -48,9 +48,11 @@ By using this function a vertical as well as horizontal matching is possible.

## License

Copyright (c) 2013-2017 University of Stuttgart.
Copyright (c) 2017 University of Stuttgart.

All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution.
All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
7 changes: 4 additions & 3 deletions docs/user/TopologyCompletion.md
Expand Up @@ -80,9 +80,10 @@ Copyright (c) 2013-2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v10.html
and http://www.apache.org/licenses/LICENSE-2.0
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html

Contributors:
* Pascal Hirmer - initial API and implementation
7 changes: 4 additions & 3 deletions docs/user/TopologyCompletionTutorial.md
Expand Up @@ -91,9 +91,10 @@ Copyright (c) 2013-2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v10.html
and http://www.apache.org/licenses/LICENSE-2.0
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html

Contributors:
* Pascal Hirmer - initial API and implementation
121 changes: 66 additions & 55 deletions docs/user/XaaSPackager.md
@@ -1,55 +1,66 @@
# XaaS Packager

## Motivation

The goal of this feature is to provide an easy way to deploy a new Deployment Artifact (e.g. web application) by reusing an existing Service Template and replacing the Deployment Artifact in the specified Node Type with the new Deployment Artifact.

## Enabling a ServiceTemplate to be reused with the XaaS Packager

To enable a Service Template to be reusable by the XaaS Packager you can either:

1. Create a new Service Template according to your requirements and specifications or
2. Use an already existing Service Template that satisfies your needs.

However, in both cases you have to add the following Tags to the ServiceTemplate so the XaaS Packager can work with them:

- **xaasPackageArtifactType** indicates the type of the artifact to be wrapped.
- **xaasPackageNode** indicates the nodeTemplate INSIDE a TAGGED ServiceTemplate to determine the destination where to inject the artifact into.
- **xaasPackageDeploymentArtifact** indicates a Deployment Artifact declared at the target Node (xaasPackageNode) which will be replaced by the given artefact.

To add the necessary Tags to a ServiceTemplate the following steps have to be completed:

1. In the Service Template view (click on Service Templates on the top of the page), choose the Service Template to be enabled to be used by the XaaS Packager.
2. Click on the *Tags* tab then click on the *add* button above the table to add new Tags to the Service Template.
3. In the add dialog that shows the following inputs:
- **Name** specifying the name of the tag (xaasPackageArtifactType, xaasPackageNode, xaasPackageDeploymentArtifact).
- **Value** the corresponding value for each tag.
4. After entering the desired name and value for a tag, click the add button that generates and saves the tag to the ServiceTemplate.

The steps 2-4 have to be completed for each of the XaaS Packager specific tags specified above.



For example, the input of:
- **name:** xaasPackageArtifactType, **value:** {http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes}
- **name:** xaasPackageDeploymentArtifact, **value:** HelloWorldDA
- **name:** xaasPackageNode, **value:** PythonApp_2_7


would generate the xml:

``` xml
<tosca:Tags> <tosca:Tag name="xaasPackageArtifactType" value="{http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes}ScriptArtifact"/> <tosca:Tag name="xaasPackageDeploymentArtifact" value="HelloWorldDA"/> <tosca:Tag name="xaasPackageNode" value="PythonApp_2_7"/> </tosca:Tags>
```
## XaaS Packger with Winery
The functionality of the XaaS Packager is available in the Winery application and can be used as follows:


1. click on the tab *ServiceTemplates* at the top of the page.
2. then click on the button *create from artifact* from the menu to the right. A dialog will show up contaning the following inputs:
- **Type**: the user has to select the appropriate Artifact Type out of the available *xaasPackagerArtifactTypes*.
- **Select Artifact**: here u can upload the Deployment Artifact that will replace the existing Artifact in the specified Node Type.
- **Tags**: additional tags can be added to the Service Template.
- **NodeTypes**(optional): allows the selection of additional Node Types that MUST be used inside the selected topology.

After setting all required inputs, a click on the *add* button trigger a search for a suitable cloud topology into which the artifact can be wrapped.
# XaaS Packager

## Motivation

The goal of this feature is to provide an easy way to deploy a new Deployment Artifact (e.g. web application) by reusing an existing Service Template and replacing the Deployment Artifact in the specified Node Type with the new Deployment Artifact.

## Enabling a ServiceTemplate to be reused with the XaaS Packager

To enable a Service Template to be reusable by the XaaS Packager you can either:

1. Create a new Service Template according to your requirements and specifications or
2. Use an already existing Service Template that satisfies your needs.

However, in both cases you have to add the following Tags to the ServiceTemplate so the XaaS Packager can work with them:

- **xaasPackageArtifactType** indicates the type of the artifact to be wrapped.
- **xaasPackageNode** indicates the nodeTemplate INSIDE a TAGGED ServiceTemplate to determine the destination where to inject the artifact into.
- **xaasPackageDeploymentArtifact** indicates a Deployment Artifact declared at the target Node (xaasPackageNode) which will be replaced by the given artefact.

To add the necessary Tags to a ServiceTemplate the following steps have to be completed:

1. In the Service Template view (click on Service Templates on the top of the page), choose the Service Template to be enabled to be used by the XaaS Packager.
2. Click on the *Tags* tab then click on the *add* button above the table to add new Tags to the Service Template.
3. In the add dialog that shows the following inputs:
- **Name** specifying the name of the tag (xaasPackageArtifactType, xaasPackageNode, xaasPackageDeploymentArtifact).
- **Value** the corresponding value for each tag.
4. After entering the desired name and value for a tag, click the add button that generates and saves the tag to the ServiceTemplate.

The steps 2-4 have to be completed for each of the XaaS Packager specific tags specified above.



For example, the input of:
- **name:** xaasPackageArtifactType, **value:** {http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes}
- **name:** xaasPackageDeploymentArtifact, **value:** HelloWorldDA
- **name:** xaasPackageNode, **value:** PythonApp_2_7


would generate the xml:

``` xml
<tosca:Tags> <tosca:Tag name="xaasPackageArtifactType" value="{http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes}ScriptArtifact"/> <tosca:Tag name="xaasPackageDeploymentArtifact" value="HelloWorldDA"/> <tosca:Tag name="xaasPackageNode" value="PythonApp_2_7"/> </tosca:Tags>
```
## XaaS Packger with Winery
The functionality of the XaaS Packager is available in the Winery application and can be used as follows:


1. click on the tab *ServiceTemplates* at the top of the page.
2. then click on the button *create from artifact* from the menu to the right. A dialog will show up contaning the following inputs:
- **Type**: the user has to select the appropriate Artifact Type out of the available *xaasPackagerArtifactTypes*.
- **Select Artifact**: here u can upload the Deployment Artifact that will replace the existing Artifact in the specified Node Type.
- **Tags**: additional tags can be added to the Service Template.
- **NodeTypes**(optional): allows the selection of additional Node Types that MUST be used inside the selected topology.

After setting all required inputs, a click on the *add* button trigger a search for a suitable cloud topology into which the artifact can be wrapped.

## License

Copyright (c) 2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
11 changes: 11 additions & 0 deletions docs/user/index.md
Expand Up @@ -29,3 +29,14 @@ The repository is also responsible for importing and exporting CSARs, the excha
- [Splitting](Splitting) - splitting functionality
- [TopologyCompletion](TopologyCompletion) - topology completion with a [Tutorial](TopologyCompletionTutorial)
- [XaaSPackager](XaaSPackager) - Enables reusing modeled topologies as templates for single applications

## License

Copyright (c) 2017 University of Stuttgart.

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v1.0]
and the [Apache License v2.0] which both accompany this distribution.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html

0 comments on commit 548ac25

Please sign in to comment.