Skip to content

Commit

Permalink
Unify license statements in ADRs and regenerate index to contain corr…
Browse files Browse the repository at this point in the history
…ect titles
  • Loading branch information
koppor committed Nov 1, 2017
1 parent ca7080b commit 27f929d
Show file tree
Hide file tree
Showing 18 changed files with 177 additions and 76 deletions.
13 changes: 9 additions & 4 deletions docs/adr/0000-use-architectural-decision-records.md
Expand Up @@ -17,9 +17,14 @@ We need to record the architectural decisions made on this project.

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
14 changes: 10 additions & 4 deletions docs/adr/0001-use-filesystem-as-backend.md
Expand Up @@ -31,9 +31,15 @@ These contents need to be shared.

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
Expand Up @@ -42,12 +42,17 @@ Windows cannot create directories named `http://www.example.com`.
Therefore, the names have to be [encoded](https://en.wikipedia.org/wiki/Character_encoding) so that an appropriate folder can be generated.



## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
14 changes: 10 additions & 4 deletions docs/adr/0003-double-encoded-urls.md
Expand Up @@ -35,9 +35,15 @@ More information about encoding is available at [dev/Encoding.md](dev/Encoding).

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
24 changes: 9 additions & 15 deletions docs/adr/0004-oauth.md
@@ -1,9 +1,5 @@
<!--
Contributors:
Lukas Harzenetter - API and implementation
-->

# OAuth with GitHub

**UserStory:**

In order to use (private) repositories instead of uploading all files into a Artifact Template, it is necessary to log in into GitHub.
Expand Down Expand Up @@ -44,16 +40,14 @@ In order to use (private) repositories instead of uploading all files into a Art

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v2.0]
and the [Apache License v2.0] which both accompany this distribution,
and are available at http://www.eclipse.org/legal/epl-v20.html
and http://www.apache.org/licenses/LICENSE-2.0
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

Contributors:
* Lukas Harzenetter - initial API and implementation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
13 changes: 9 additions & 4 deletions docs/adr/0005-XML-editor-does-not-enforce-validation.md
Expand Up @@ -15,9 +15,14 @@

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
14 changes: 10 additions & 4 deletions docs/adr/0006-wrap-properties-in-tosca-properties-element.md
Expand Up @@ -14,9 +14,15 @@ When GETting/PUTting the properties of an entitty template, the content has to b

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
15 changes: 12 additions & 3 deletions docs/adr/0007-custom-URI-for-lifecycle-interface.md
Expand Up @@ -9,7 +9,16 @@ That interface has to take a URI for a name
* `http://www.example.com/interfaces/lifecycle` (from http://docs.oasis-open.org/tosca/tosca-primer/v1.0/tosca-primer-v1.0.html)
* `tosca.interfaces.node.lifecycle.Standard` (from http://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.1/TOSCA-Simple-Profile-YAML-v1.1.html)

## Decision Outcome
## License

* Chosen Alternative: *`http://opentosca.org/interfaces/lifecycle`*
* There is no standardized name and we can show that this is the lifecycle, we support in the OpenTOSCA eco system
Copyright (c) 2017 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
15 changes: 10 additions & 5 deletions docs/adr/0008-no-support-for-local-git-source-clones.md
Expand Up @@ -21,7 +21,7 @@ The solution for the user should be:
* Using filter-branch (https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/)
* Using git sparse-checkout to create a local clone (https://gist.github.com/sumardi/5559896)

## Conclusion
## Decision Outcome

* Chosen Alternative: no support for local edit

Expand Down Expand Up @@ -63,9 +63,14 @@ we decided to not support any clone/push functionality.

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
14 changes: 10 additions & 4 deletions docs/adr/0009-manual-tosca-yaml-serialisation.md
Expand Up @@ -16,9 +16,15 @@ The TOSCA YAML files have to be read into a Java model (deserialized) and writte

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
14 changes: 10 additions & 4 deletions docs/adr/0010-tosca-yaml-deserialisation-using-snakeyaml.md
Expand Up @@ -37,9 +37,15 @@ The TOSCA YAML files have to be read into a Java model (deserialized) and writte

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
14 changes: 14 additions & 0 deletions docs/adr/0011-use-builder-pattern-for-model-classes.md
Expand Up @@ -60,3 +60,17 @@ public static class Builder extends TEntityType.Builder<Builder> {

[Builders]:(https://en.wikipedia.org/wiki/Builder_pattern)
[stackoverflow]: https://stackoverflow.com/a/5818701/8235252

## License

Copyright (c) 2017 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
13 changes: 9 additions & 4 deletions docs/adr/0012-provide-support-for-custom-kv-properties.md
Expand Up @@ -14,9 +14,14 @@ Most properties are key/value

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
14 changes: 14 additions & 0 deletions docs/adr/0013-routes-in-Angular.md
Expand Up @@ -25,3 +25,17 @@
* `+` *Implicit better type safety*
* `+` *Only valid routes are available for each `ToscaType`*
* `-` *More files need to be extended/created in order to add new routes*

## License

Copyright (c) 2017 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
15 changes: 11 additions & 4 deletions docs/adr/0014-use-eclipse-orion-as-editor.md
@@ -1,4 +1,5 @@
# Use Eclipse Orion as Editor

Editor should provide syntax highlighting and work in browser.

## Considered Alternatives
Expand All @@ -22,9 +23,15 @@ For more details see the [ultimate comparison](https://github.com/ultimate-compa

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
4 changes: 2 additions & 2 deletions docs/adr/index.md
Expand Up @@ -8,7 +8,7 @@ This lists the architectural decisions for Eclipse Winery.
- [ADR-0001](0001-use-filesystem-as-backend.md) - Use filesystem as backend
- [ADR-0002](0002-filesystem-folder-structure-using-type-namespace-id-structure.md) - File system folder structure using type-namespace-id structure
- [ADR-0003](0003-double-encoded-urls.md) - Double Encoded URLs
- [ADR-0004](0004-oauth.md) - --Contributors:
- [ADR-0004](0004-oauth.md) - OAuth with GitHub
- [ADR-0005](0005-XML-editor-does-not-enforce-validation.md) - XML editor does not enforce validation
- [ADR-0006](0006-wrap-properties-in-tosca-properties-element.md) - Wrap properties in TOSCA properties element
- [ADR-0007](0007-custom-URI-for-lifecycle-interface.md) - Custom URI for lifecycle interface
Expand All @@ -18,7 +18,7 @@ This lists the architectural decisions for Eclipse Winery.
- [ADR-0011](0011-use-builder-pattern-for-model-classes.md) - Use Builder Pattern for Model Classes
- [ADR-0012](0012-provide-support-for-custom-kv-properties.md) - Provide Support for Custom Key-Value Properties
- [ADR-0013](0013-routes-in-Angular.md) - *Routes in the Repository Angular App*
- [ADR-0014](0014-use-eclipse-orion-as-editor.md) - Use Eclipse Orion as EditorEditor should provide syntax highlighting and work in browser.
- [ADR-0014](0014-use-eclipse-orion-as-editor.md) - Use Eclipse Orion as Editor

<!-- adrlogstop -->

Expand Down
13 changes: 9 additions & 4 deletions docs/adr/template.md
Expand Up @@ -44,9 +44,14 @@

## License

Copyright (c) 2017 University of Stuttgart.
Copyright (c) 2017 Contributors to the Eclipse Foundation

All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
15 changes: 9 additions & 6 deletions docs/dev/CodeHeaders.md
Expand Up @@ -33,11 +33,14 @@ Full information is available at: http://www.eclipse.org/legal/copyrightandlicen

## License

Copyright (c) 2013-2017 University of Stuttgart.
Copyright (c) 2013-2017 Contributors to the Eclipse Foundation

All rights reserved. This program and the accompanying materials
are made available under the terms of the [Eclipse Public License v2.0]
and the [Apache License v2.0] which both accompany this distribution.
See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
[Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
which is available at https://www.apache.org/licenses/LICENSE-2.0.

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0

0 comments on commit 27f929d

Please sign in to comment.