diff options
| author | Ralf Mollik | 2018-06-28 14:39:52 +0000 |
|---|---|---|
| committer | Ralf Mollik | 2018-06-28 14:39:52 +0000 |
| commit | 209b1bb82c14897b8c744645eb86556a8fa293e8 (patch) | |
| tree | 8666f6e0c04ffa6b2e81cf089c13fca0dc72d0ca | |
| parent | 8b5bb041b52f225f62561934ac3ae370ae39023b (diff) | |
| download | org.eclipse.osbp.vaaclipse.addons.softwarefactory-209b1bb82c14897b8c744645eb86556a8fa293e8.tar.gz org.eclipse.osbp.vaaclipse.addons.softwarefactory-209b1bb82c14897b8c744645eb86556a8fa293e8.tar.xz org.eclipse.osbp.vaaclipse.addons.softwarefactory-209b1bb82c14897b8c744645eb86556a8fa293e8.zip | |
https://bugs.eclipse.org/bugs/show_bug.cgi?id=536407, migrate to EPL 2.0 and catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
52 files changed, 2557 insertions, 1566 deletions
@@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 1, 2016</p> +<p>November 30, 2017</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml index 0e69891..ba4702f 100644 --- a/jenkins.build.config.xml +++ b/jenkins.build.config.xml @@ -2,9 +2,11 @@ <!--#======================================================================= --> <!--# Copyright (c) 2016 - Loetz GmbH&Co.KG --> <!--# All rights reserved. This program and the accompanying materials --> -<!--# are made available under the terms of the Eclipse Public License v1.0 --> +<!--# are made available under the terms of the Eclipse Public License 2.0 --> <!--# which accompanies this distribution, and is available at --> -<!--# http://www.eclipse.org/legal/epl-v10.html --> +<!--# https://www.eclipse.org/legal/epl-2.0/ --> +<!--# --> +<!--# SPDX-License-Identifier: EPL-2.0 --> <!--# --> <!--# Contributors: --> <!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation --> @@ -25,6 +27,7 @@ <jenkins.build.dependency>org.eclipse.osbp.dsl.metadata.service</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.ecview.addons</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.ecview.core</jenkins.build.dependency> + <jenkins.build.dependency>org.eclipse.osbp.ecview.extension</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.ecview.extension.api</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.eventbroker</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.infogrid</jenkins.build.dependency> diff --git a/notice.html b/notice.html index c3d34c3..008b801 100644 --- a/notice.html +++ b/notice.html @@ -7,101 +7,183 @@ </head> <body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>April 9, 2014</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a - href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</p> + + <h3>Usage Of Content</h3> + + <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, + INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY + THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED + BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS + GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY + APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED + BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT + USE THE CONTENT.</p> + + <h3>Applicable Licenses</h3> + + <p> + Unless otherwise indicated, all Content made available by the Eclipse + Foundation is provided to you under the terms and conditions of the + Eclipse Public License Version 2.0 ("EPL"). A copy of the + EPL is provided with this Content and is also available at <a + href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + For purposes of the EPL, "Program" will mean the Content. + </p> + + <p>Content includes, but is not limited to, source code, object + code, documentation and other files maintained in the Eclipse + Foundation source code repository ("Repository") in software + modules ("Modules") and made available as downloadable + archives ("Downloads").</p> + + <ul> + <li>Content may be structured and packaged into modules to + facilitate delivering, extending, and upgrading the Content. Typical + modules may include plug-ins ("Plug-ins"), plug-in + fragments ("Fragments"), and features + ("Features").</li> + <li>Each Plug-in or Fragment may be packaged as a sub-directory + or JAR (Java™ ARchive) in a directory named + "plugins".</li> + <li>A Feature is a bundle of one or more Plug-ins and/or + Fragments and associated material. Each Feature may be packaged as a + sub-directory in a directory named "features". Within a + Feature, files named "feature.xml" may contain a list of + the names and version numbers of the Plug-ins and/or Fragments + associated with that Feature.</li> + <li>Features may also include other Features ("Included + Features"). Within a Feature, files named + "feature.xml" may contain a list of the names and version + numbers of Included Features.</li> + </ul> + + <p>The terms and conditions governing Plug-ins and Fragments should + be contained in files named "about.html" + ("Abouts"). The terms and conditions governing Features and + Included Features should be contained in files named + "license.html" ("Feature Licenses"). Abouts and + Feature Licenses may be located in any directory of a Download or + Module including, but not limited to the following locations:</p> + + <ul> + <li>The top-level (root) directory</li> + <li>Plug-in and Fragment directories</li> + <li>Inside Plug-ins and Fragments packaged as JARs</li> + <li>Sub-directories of the directory named "src" of + certain Plug-ins</li> + <li>Feature directories</li> + </ul> + + <p>Note: if a Feature made available by the Eclipse Foundation is + installed using the Provisioning Technology (as defined below), you + must agree to a license ("Feature Update License") during + the installation process. If the Feature contains Included Features, + the Feature Update License should either provide you with the terms + and conditions governing the Included Features or inform you where you + can locate them. Feature Update Licenses may be found in the + "license" property of files named + "feature.properties" found within a Feature. Such Abouts, + Feature Licenses, and Feature Update Licenses contain the terms and + conditions (or references to such terms and conditions) that govern + your use of the associated Content in that directory.</p> + + <p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY + REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND + CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT + ARE NOT LIMITED TO):</p> + + <ul> + <li>Eclipse Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <li>Eclipse Distribution License Version 1.0 (available at <a + href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>) + </li> + <li>Common Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>) + </li> + <li>Apache Software License 1.1 (available at <a + href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>) + </li> + <li>Apache Software License 2.0 (available at <a + href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) + </li> + <li>Mozilla Public License Version 1.1 (available at <a + href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>) + </li> + </ul> + + <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND + CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, + or Feature Update License is provided, please contact the Eclipse + Foundation to determine what terms and conditions govern that + particular Content.</p> + + + <h3>Use of Provisioning Technology</h3> + + <p> + The Eclipse Foundation makes available provisioning software, examples + of which include, but are not limited to, p2 and the Eclipse Update + Manager ("Provisioning Technology") for the purpose of + allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This + capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about + packaging Installable Software is available at <a + href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> + ("Specification"). + </p> + + <p>You may use Provisioning Technology to allow other parties to + install Installable Software. You shall be responsible for enabling + the applicable license agreements relating to the Installable Software + to be presented to, and accepted by, the users of the Provisioning + Technology in accordance with the Specification. By using Provisioning + Technology in such a manner and making it available in accordance with + the Specification, you further acknowledge your agreement to, and the + acquisition of all necessary rights to permit the following:</p> + + <ol> + <li>A series of actions may occur ("Provisioning + Process") in which a user may execute the Provisioning + Technology on a machine ("Target Machine") with the intent + of installing, extending or updating the functionality of an + Eclipse-based product.</li> + <li>During the Provisioning Process, the Provisioning Technology + may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.</li> + <li>Pursuant to the Specification, you will provide to the user + the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such + Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable + Software Agreement must inform the user of the terms and conditions + that govern the Installable Software and must solicit acceptance by + the end user in the manner prescribed in such Installable Software + Agreement. Upon such indication of agreement by the user, the + provisioning Technology will complete installation of the Installable + Software.</li> + </ol> + + <h3>Cryptography</h3> + + <p>Content may contain encryption software. The country in which + you are currently may have restrictions on the import, possession, and + use, and/or re-export to another country, of encryption software. + BEFORE using any encryption software, please check the country's laws, + regulations and policies concerning the import, possession, or use, + and re-export of encryption software, to see if this is permitted.</p> + + <p> + <small>Java and all Java-based trademarks are trademarks of + Oracle Corporation in the United States, other countries, or both.</small> + </p> </body> </html> diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt index ff42ad4..fc5938d 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/LICENSE.txt @@ -1,161 +1,140 @@ -Eclipse Public License -v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION -OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. -A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate -modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of -its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute -and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code -form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the -combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not -apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no -assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property -rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity -based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and -licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property -rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the -Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to -grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including -warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any -other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it -in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows -subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and -the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes -the Program in a commercial product offering should do so in a manner which does not create potential liability for -other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions -brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual -property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is -then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. -Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to -those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, -the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for -determining the appropriateness of using and distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance -with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or -enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) -alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such -Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or -conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such -noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution -of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement -is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish -new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the -right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including Contributions) may always be -distributed subject to the version of the Agreement under which it was received. In addition, after a new version of -the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the -new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to -the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States -of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause -of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file +Eclipse Foundation Software User Agreement + +November 22, 2017 + +Usage Of Content + +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE +AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU +MAY NOT USE THE CONTENT. + +Applicable Licenses + +Unless otherwise indicated, all Content made available by the Eclipse Foundation +is provided to you under the terms and conditions of the Eclipse Public License +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL, +"Program" will mean the Content. + +Content includes, but is not limited to, source code, object code, documentation +and other files maintained in the Eclipse Foundation source code repository +("Repository") in software modules ("Modules") and made available as +downloadable archives ("Downloads"). + +- Content may be structured and packaged into modules to facilitate + delivering, extending, and upgrading the Content. Typical modules may + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and + features ("Features"). +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR + (Javaâ„¢ ARchive) in a directory named "plugins". +- A Feature is a bundle of one or more Plug-ins and/or Fragments and + associated material. Each Feature may be packaged as a sub-directory in a + directory named "features". Within a Feature, files named "feature.xml" may + contain a list of the names and version numbers of the Plug-ins and/or + Fragments associated with that Feature. +- Features may also include other Features ("Included Features"). Within a + Feature, files named "feature.xml" may contain a list of the names and + version numbers of Included Features. + +The terms and conditions governing Plug-ins and Fragments should be contained in +files named "about.html" ("Abouts"). The terms and conditions governing Features +and Included Features should be contained in files named "license.html" +("Feature Licenses"). Abouts and Feature Licenses may be located in any +directory of a Download or Module including, but not limited to the following +locations: + +- The top-level (root) directory +- Plug-in and Fragment directories +- Inside Plug-ins and Fragments packaged as JARs +- Sub-directories of the directory named "src" of certain Plug-ins +- Feature directories + +Note: if a Feature made available by the Eclipse Foundation is installed using +the Provisioning Technology (as defined below), you must agree to a license +("Feature Update License") during the installation process. If the Feature +contains Included Features, the Feature Update License should either provide you +with the terms and conditions governing the Included Features or inform you +where you can locate them. Feature Update Licenses may be found in the "license" +property of files named "feature.properties" found within a Feature. Such +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and +conditions (or references to such terms and conditions) that govern your use of +the associated Content in that directory. + +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO): + +- Eclipse Public License Version 1.0 (available at + http://www.eclipse.org/legal/epl-v10.html) +- Eclipse Distribution License Version 1.0 (available at + http://www.eclipse.org/licenses/edl-v1.0.html) +- Common Public License Version 1.0 (available at + http://www.eclipse.org/legal/cpl-v10.html) +- Apache Software License 1.1 (available at + http://www.apache.org/licenses/LICENSE) +- Apache Software License 2.0 (available at + http://www.apache.org/licenses/LICENSE-2.0) +- Mozilla Public License Version 1.1 (available at + http://www.mozilla.org/MPL/MPL-1.1.html) + +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is +provided, please contact the Eclipse Foundation to determine what terms and +conditions govern that particular Content. + +Use of Provisioning Technology + +The Eclipse Foundation makes available provisioning software, examples of which +include, but are not limited to, p2 and the Eclipse Update Manager +("Provisioning Technology") for the purpose of allowing users to install +software, documentation, information and/or other materials (collectively +"Installable Software"). This capability is provided with the intent of allowing +such users to install, extend and update Eclipse-based products. Information +about packaging Installable Software is available at +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification"). + +You may use Provisioning Technology to allow other parties to install +Installable Software. You shall be responsible for enabling the applicable +license agreements relating to the Installable Software to be presented to, and +accepted by, the users of the Provisioning Technology in accordance with the +Specification. By using Provisioning Technology in such a manner and making it +available in accordance with the Specification, you further acknowledge your +agreement to, and the acquisition of all necessary rights to permit the +following: + +1. A series of actions may occur ("Provisioning Process") in which a user may + execute the Provisioning Technology on a machine ("Target Machine") with the + intent of installing, extending or updating the functionality of an + Eclipse-based product. +2. During the Provisioning Process, the Provisioning Technology may cause third + party Installable Software or a portion thereof to be accessed and copied to + the Target Machine. +3. Pursuant to the Specification, you will provide to the user the terms and + conditions that govern the use of the Installable Software ("Installable + Software Agreement") and such Installable Software Agreement shall be + accessed from the Target Machine in accordance with the Specification. Such + Installable Software Agreement must inform the user of the terms and + conditions that govern the Installable Software and must solicit acceptance + by the end user in the manner prescribed in such Installable + Software Agreement. Upon such indication of agreement by the user, the + provisioning Technology will complete installation of the + Installable Software. + +Cryptography + +Content may contain encryption software. The country in which you are currently +may have restrictions on the import, possession, and use, and/or re-export to +another country, of encryption software. BEFORE using any encryption software, +please check the country's laws, regulations and policies concerning the import, +possession, or use, and re-export of encryption software, to see if this is +permitted. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the +United States, other countries, or both. diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties index 72ef22d..058ad81 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/build.properties @@ -1,6 +1,6 @@ -bin.includes = epl-v10.html, feature.xml,\ +bin.includes = epl-2.0.html, feature.xml,\ feature.properties,\ license.html,\ LICENSE.txt -src.includes = epl-v10.html, LICENSE.txt,\ +src.includes = epl-2.0.html, LICENSE.txt,\ license.html diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-2.0.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-2.0.html new file mode 100644 index 0000000..637a181 --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-2.0.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution” means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + “originates” from a Contributor if it was added to the Program by such + Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor” means any person or entity that Distributes the Program.</p> + <p>“Licensed Patents” mean patent claims licensable by a Contributor which + are necessarily infringed by the use or sale of its Contribution alone + or when combined with the Program. + </p> + <p>“Program” means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient” means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works” shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works” shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute” means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code” means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License” means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, + at the time the Contribution is added by the Contributor, such + addition of the Contribution causes such combination to be covered + by the Licensed Patents. The patent license shall not apply to any + other combinations which include the Contribution. No hardware per + se is licensed hereunder. + </li> + <li>c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the rights + and licenses granted hereunder, each Recipient hereby assumes sole + responsibility to secure any other intellectual property rights needed, + if any. For example, if a third party patent license is required to + allow Recipient to Distribute the Program, it is Recipient's + responsibility to acquire that license before distributing the Program. + </li> + <li>d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including warranties + or conditions of title and non-infringement, and implied warranties + or conditions of merchantability and fitness for a particular purpose; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>Commercial distributors of software may accept certain responsibilities + with respect to end users, business partners and the like. While this + license is intended to facilitate the commercial use of the Program, the + Contributor who includes the Program in a commercial product offering should + do so in a manner which does not create potential liability for other + Contributors. Therefore, if a Contributor includes the Program in a + commercial product offering, such Contributor (“Commercial Contributor”) + hereby agrees to defend and indemnify every other Contributor + (“Indemnified Contributor”) against any losses, damages and costs + (collectively “Losses”) arising from claims, lawsuits and other legal actions + brought by a third party against the Indemnified Contributor to the extent + caused by the acts or omissions of such Commercial Contributor in connection + with its distribution of the Program in a commercial product offering. + The obligations in this section do not apply to any claims or Losses relating + to any actual or alleged intellectual property infringement. In order to + qualify, an Indemnified Contributor must: a) promptly notify the + Commercial Contributor in writing of such claim, and b) allow the Commercial + Contributor to control, and cooperate with the Commercial Contributor in, + the defense and any related settlement negotiations. The Indemnified + Contributor may participate in any such claim at its own expense. + </p> + <p>For example, a Contributor might include the Program + in a commercial product offering, Product X. That Contributor is then a + Commercial Contributor. If that Commercial Contributor then makes performance + claims, or offers warranties related to Product X, those performance claims + and warranties are such Commercial Contributor's responsibility alone. + Under this section, the Commercial Contributor would have to defend claims + against the other Contributors related to those performance claims and + warranties, and if a court requires any other Contributor to pay any damages + as a result, the Commercial Contributor must pay those damages. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is + solely responsible for determining the appropriateness of using and + distributing the Program and assumes all risks associated with its + exercise of rights under this Agreement, including but not limited to the + risks and costs of program errors, compliance with applicable laws, damage + to or loss of data, programs or equipment, and unavailability or + interruption of operations. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY + LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS + GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + </p> + <h2 id="general">7. GENERAL</h2> + <p>If any provision of this Agreement is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of the + remainder of the terms of this Agreement, and without further action by the + parties hereto, such provision shall be reformed to the minimum extent + necessary to make such provision valid and enforceable. + </p> + <p>If Recipient institutes patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Program itself + (excluding combinations of the Program with other software or hardware) + infringes such Recipient's patent(s), then such Recipient's rights granted + under Section 2(b) shall terminate as of the date such litigation is filed. + </p> + <p>All Recipient's rights under this Agreement shall terminate if it fails to + comply with any of the material terms or conditions of this Agreement and + does not cure such failure in a reasonable period of time after becoming + aware of such noncompliance. If all Recipient's rights under this Agreement + terminate, Recipient agrees to cease use and distribution of the Program + as soon as reasonably practicable. However, Recipient's obligations under + this Agreement and any licenses granted by Recipient relating to the + Program shall continue and survive. + </p> + <p>Everyone is permitted to copy and distribute copies of this Agreement, + but in order to avoid inconsistency the Agreement is copyrighted and may + only be modified in the following manner. The Agreement Steward reserves + the right to publish new versions (including revisions) of this Agreement + from time to time. No one other than the Agreement Steward has the right + to modify this Agreement. The Eclipse Foundation is the initial Agreement + Steward. The Eclipse Foundation may assign the responsibility to serve as + the Agreement Steward to a suitable separate entity. Each new version of + the Agreement will be given a distinguishing version number. The Program + (including Contributions) may always be Distributed subject to the version + of the Agreement under which it was received. In addition, after a new + version of the Agreement is published, Contributor may elect to Distribute + the Program (including its Contributions) under the new version. + </p> + <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient + receives no rights or licenses to the intellectual property of any + Contributor under this Agreement, whether expressly, by implication, + estoppel or otherwise. All rights in the Program not expressly granted + under this Agreement are reserved. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.” + </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-v10.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-v10.html deleted file mode 100644 index b398acc..0000000 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!--?xml version="1.0" encoding="ISO-8859-1" ?--> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -</head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.</p> - -<p class="list">c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.</p> - -<p class="list">d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.</p> - -<p>For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED 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. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p> - -<p><b>7. GENERAL</b></p> - -<p>If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.</p> - -<p>If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.</p> - -<p>All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.</p> - -<p>Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.</p> - -<p>This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.</p> - - - -</body></html>
\ No newline at end of file diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties index fa76f46..90291b5 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.properties @@ -1,9 +1,11 @@ ############################################################################### # Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Cristiano Gavião - initial API and implementation @@ -30,9 +32,11 @@ updateSiteName= copyright=\ Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) \n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License 2.0 \n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/\n\ +\n\ +SPDX-License-Identifier: EPL-2.0\n\ \n\ ################ end of copyright property #################################### @@ -44,126 +48,143 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -February 1, 2011\n\ +\n\ +November 22, 2017\n\ \n\ Usage Of Content\n\ \n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\ +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\ +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\ +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\ +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\ +AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\ +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\ +MAY NOT USE THE CONTENT.\n\ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by the\n\ -Eclipse Foundation is provided to you under the terms and conditions of\n\ -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse Foundation source code\n\ -repository ("Repository") in software modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ -Update License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ -terms and conditions (or references to such terms and conditions) that\n\ -govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -\n\Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include,\n\ -but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ -the purpose of allowing users to install software, documentation, information and/or\n\ -other materials (collectively "Installable Software"). This capability is provided with\n\ -the intent of allowing such users to install, extend and update Eclipse-based products.\n\ -Information about packaging Installable Software is available at\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ +is provided to you under the terms and conditions of the Eclipse Public License\n\ +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\ +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\ +"Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code, documentation\n\ +and other files maintained in the Eclipse Foundation source code repository\n\ +("Repository") in software modules ("Modules") and made available as\n\ +downloadable archives ("Downloads").\n\ +\n\ +- Content may be structured and packaged into modules to facilitate\n\ + delivering, extending, and upgrading the Content. Typical modules may\n\ + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ + features ("Features").\n\ +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ + (Javaâ„¢ ARchive) in a directory named "plugins".\n\ +- A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ + associated material. Each Feature may be packaged as a sub-directory in a\n\ + directory named "features". Within a Feature, files named "feature.xml" may\n\ + contain a list of the names and version numbers of the Plug-ins and/or\n\ + Fragments associated with that Feature.\n\ +- Features may also include other Features ("Included Features"). Within a\n\ + Feature, files named "feature.xml" may contain a list of the names and\n\ + version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be contained in\n\ +files named "about.html" ("Abouts"). The terms and conditions governing Features\n\ +and Included Features should be contained in files named "license.html"\n\ +("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\ +directory of a Download or Module including, but not limited to the following\n\ +locations:\n\ +\n\ +- The top-level (root) directory\n\ +- Plug-in and Fragment directories\n\ +- Inside Plug-ins and Fragments packaged as JARs\n\ +- Sub-directories of the directory named "src" of certain Plug-ins\n\ +- Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using\n\ +the Provisioning Technology (as defined below), you must agree to a license\n\ +("Feature Update License") during the installation process. If the Feature\n\ +contains Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform you\n\ +where you can locate them. Feature Update Licenses may be found in the "license"\n\ +property of files named "feature.properties" found within a Feature. Such\n\ +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\ +conditions (or references to such terms and conditions) that govern your use of\n\ +the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\ +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\ +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ +- Eclipse Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/epl-v10.html)\n\ +- Eclipse Distribution License Version 1.0 (available at\n\ + http://www.eclipse.org/licenses/edl-v1.0.html)\n\ +- Common Public License Version 1.0 (available at\n\ + http://www.eclipse.org/legal/cpl-v10.html)\n\ +- Apache Software License 1.1 (available at\n\ + http://www.apache.org/licenses/LICENSE)\n\ +- Apache Software License 2.0 (available at\n\ + http://www.apache.org/licenses/LICENSE-2.0)\n\ +- Mozilla Public License Version 1.1 (available at\n\ + http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\ +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\ +provided, please contact the Eclipse Foundation to determine what terms and\n\ +conditions govern that particular Content.\n\ +\n\ +Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which\n\ +include, but are not limited to, p2 and the Eclipse Update Manager\n\ +("Provisioning Technology") for the purpose of allowing users to install\n\ +software, documentation, information and/or other materials (collectively\n\ +"Installable Software"). This capability is provided with the intent of allowing\n\ +such users to install, extend and update Eclipse-based products. Information\n\ +about packaging Installable Software is available at\n\ http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ \n\ -You may use Provisioning Technology to allow other parties to install Installable Software.\n\ -You shall be responsible for enabling the applicable license agreements relating to the\n\ -Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ -in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ -making it available in accordance with the Specification, you further acknowledge your\n\ -agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ - the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ - extending or updating the functionality of an Eclipse-based product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ - Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ - govern the use of the Installable Software ("Installable Software Agreement") and such\n\ - Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ - with the Specification. Such Installable Software Agreement must inform the user of the\n\ - terms and conditions that govern the Installable Software and must solicit acceptance by\n\ - the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation\n\ - of the Installable Software.\n\ +You may use Provisioning Technology to allow other parties to install\n\ +Installable Software. You shall be responsible for enabling the applicable\n\ +license agreements relating to the Installable Software to be presented to, and\n\ +accepted by, the users of the Provisioning Technology in accordance with the\n\ +Specification. By using Provisioning Technology in such a manner and making it\n\ +available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the\n\ +following:\n\ +\n\ +1. A series of actions may occur ("Provisioning Process") in which a user may\n\ + execute the Provisioning Technology on a machine ("Target Machine") with the\n\ + intent of installing, extending or updating the functionality of an\n\ + Eclipse-based product.\n\ +2. During the Provisioning Process, the Provisioning Technology may cause third\n\ + party Installable Software or a portion thereof to be accessed and copied to\n\ + the Target Machine.\n\ +3. Pursuant to the Specification, you will provide to the user the terms and\n\ + conditions that govern the use of the Installable Software ("Installable\n\ + Software Agreement") and such Installable Software Agreement shall be\n\ + accessed from the Target Machine in accordance with the Specification. Such\n\ + Installable Software Agreement must inform the user of the terms and\n\ + conditions that govern the Installable Software and must solicit acceptance\n\ + by the end user in the manner prescribed in such Installable\n\ + Software Agreement. Upon such indication of agreement by the user, the\n\ + provisioning Technology will complete installation of the\n\ + Installable Software.\n\ \n\ Cryptography\n\ \n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use, and\n\ -re-export of encryption software, to see if this is permitted.\n\ +Content may contain encryption software. The country in which you are currently\n\ +may have restrictions on the import, possession, and use, and/or re-export to\n\ +another country, of encryption software. BEFORE using any encryption software,\n\ +please check the country's laws, regulations and policies concerning the import,\n\ +possession, or use, and re-export of encryption software, to see if this is\n\ +permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\ +United States, other countries, or both.\n ########### end of license property ########################################## diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml index f6d95d4..c44ed7d 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/feature.xml @@ -2,9 +2,11 @@ <!--#======================================================================= --> <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) --> <!--# All rights reserved. This program and the accompanying materials --> -<!--# are made available under the terms of the Eclipse Public License v1.0 --> +<!--# are made available under the terms of the Eclipse Public License 2.0 --> <!--# which accompanies this distribution, and is available at --> -<!--# http://www.eclipse.org/legal/epl-v10.html --> +<!--# https://www.eclipse.org/legal/epl-2.0/ --> +<!--# --> +<!--# SPDX-License-Identifier: EPL-2.0 --> <!--# --> <!--# Contributors: --> <!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation --> diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html index 6e579a5..008b801 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/license.html @@ -1,164 +1,189 @@ -<!--?xml version="1.0" encoding="ISO-8859-1" ?--> +<?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <title>Eclipse Foundation Software User Agreement</title> </head> <body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse - Foundation is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also - available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, -documentation and other files maintained in the Eclipse Foundation -source code - repository ("Repository") in software modules ("Modules") and made -available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to -facilitate delivering, extending, and upgrading the Content. Typical -modules may include plug-ins ("Plug-ins"), plug-in fragments -("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or -Fragments and associated material. Each Feature may be packaged as a -sub-directory in a directory named "features". Within a Feature, files -named "feature.xml" may contain a list of the names and version numbers -of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included -Features"). Within a Feature, files named "feature.xml" may contain a -list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be -contained in files named "about.html" ("Abouts"). The terms and -conditions governing Features and -Included Features should be contained in files named "license.html" -("Feature Licenses"). Abouts and Feature Licenses may be located in any - directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is -installed using the Provisioning Technology (as defined below), you must - agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the -Feature Update License should either provide you with the terms and -conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be -found in the "license" property of files named "feature.properties" -found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the -terms and conditions (or references to such terms and conditions) that -govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. - SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND -CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, -or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions -govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, -examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of -allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This -capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about -packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install - Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to - be presented to, and accepted by, the users of the Provisioning -Technology - in accordance with the Specification. By using Provisioning -Technology in such a manner and making it available in accordance with -the - Specification, you further acknowledge your agreement to, and the -acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in -which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, -extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology -may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user -the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable -Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable -Software Agreement must inform the user of the terms and conditions that - govern - the Installable Software and must solicit acceptance by the end -user in the manner prescribed in such Installable Software Agreement. -Upon such - indication of agreement by the user, the provisioning Technology -will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are - currently may have restrictions on the import, possession, and use, -and/or re-export to - another country, of encryption software. BEFORE using any encryption -software, please check the country's laws, regulations and policies -concerning the import, - possession, or use, and re-export of encryption software, to see if -this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> - - -</body></html>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</p> + + <h3>Usage Of Content</h3> + + <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, + INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY + THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED + BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS + GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY + APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED + BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT + USE THE CONTENT.</p> + + <h3>Applicable Licenses</h3> + + <p> + Unless otherwise indicated, all Content made available by the Eclipse + Foundation is provided to you under the terms and conditions of the + Eclipse Public License Version 2.0 ("EPL"). A copy of the + EPL is provided with this Content and is also available at <a + href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + For purposes of the EPL, "Program" will mean the Content. + </p> + + <p>Content includes, but is not limited to, source code, object + code, documentation and other files maintained in the Eclipse + Foundation source code repository ("Repository") in software + modules ("Modules") and made available as downloadable + archives ("Downloads").</p> + + <ul> + <li>Content may be structured and packaged into modules to + facilitate delivering, extending, and upgrading the Content. Typical + modules may include plug-ins ("Plug-ins"), plug-in + fragments ("Fragments"), and features + ("Features").</li> + <li>Each Plug-in or Fragment may be packaged as a sub-directory + or JAR (Java™ ARchive) in a directory named + "plugins".</li> + <li>A Feature is a bundle of one or more Plug-ins and/or + Fragments and associated material. Each Feature may be packaged as a + sub-directory in a directory named "features". Within a + Feature, files named "feature.xml" may contain a list of + the names and version numbers of the Plug-ins and/or Fragments + associated with that Feature.</li> + <li>Features may also include other Features ("Included + Features"). Within a Feature, files named + "feature.xml" may contain a list of the names and version + numbers of Included Features.</li> + </ul> + + <p>The terms and conditions governing Plug-ins and Fragments should + be contained in files named "about.html" + ("Abouts"). The terms and conditions governing Features and + Included Features should be contained in files named + "license.html" ("Feature Licenses"). Abouts and + Feature Licenses may be located in any directory of a Download or + Module including, but not limited to the following locations:</p> + + <ul> + <li>The top-level (root) directory</li> + <li>Plug-in and Fragment directories</li> + <li>Inside Plug-ins and Fragments packaged as JARs</li> + <li>Sub-directories of the directory named "src" of + certain Plug-ins</li> + <li>Feature directories</li> + </ul> + + <p>Note: if a Feature made available by the Eclipse Foundation is + installed using the Provisioning Technology (as defined below), you + must agree to a license ("Feature Update License") during + the installation process. If the Feature contains Included Features, + the Feature Update License should either provide you with the terms + and conditions governing the Included Features or inform you where you + can locate them. Feature Update Licenses may be found in the + "license" property of files named + "feature.properties" found within a Feature. Such Abouts, + Feature Licenses, and Feature Update Licenses contain the terms and + conditions (or references to such terms and conditions) that govern + your use of the associated Content in that directory.</p> + + <p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY + REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND + CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT + ARE NOT LIMITED TO):</p> + + <ul> + <li>Eclipse Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <li>Eclipse Distribution License Version 1.0 (available at <a + href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>) + </li> + <li>Common Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>) + </li> + <li>Apache Software License 1.1 (available at <a + href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>) + </li> + <li>Apache Software License 2.0 (available at <a + href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) + </li> + <li>Mozilla Public License Version 1.1 (available at <a + href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>) + </li> + </ul> + + <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND + CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, + or Feature Update License is provided, please contact the Eclipse + Foundation to determine what terms and conditions govern that + particular Content.</p> + + + <h3>Use of Provisioning Technology</h3> + + <p> + The Eclipse Foundation makes available provisioning software, examples + of which include, but are not limited to, p2 and the Eclipse Update + Manager ("Provisioning Technology") for the purpose of + allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This + capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about + packaging Installable Software is available at <a + href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> + ("Specification"). + </p> + + <p>You may use Provisioning Technology to allow other parties to + install Installable Software. You shall be responsible for enabling + the applicable license agreements relating to the Installable Software + to be presented to, and accepted by, the users of the Provisioning + Technology in accordance with the Specification. By using Provisioning + Technology in such a manner and making it available in accordance with + the Specification, you further acknowledge your agreement to, and the + acquisition of all necessary rights to permit the following:</p> + + <ol> + <li>A series of actions may occur ("Provisioning + Process") in which a user may execute the Provisioning + Technology on a machine ("Target Machine") with the intent + of installing, extending or updating the functionality of an + Eclipse-based product.</li> + <li>During the Provisioning Process, the Provisioning Technology + may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.</li> + <li>Pursuant to the Specification, you will provide to the user + the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such + Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable + Software Agreement must inform the user of the terms and conditions + that govern the Installable Software and must solicit acceptance by + the end user in the manner prescribed in such Installable Software + Agreement. Upon such indication of agreement by the user, the + provisioning Technology will complete installation of the Installable + Software.</li> + </ol> + + <h3>Cryptography</h3> + + <p>Content may contain encryption software. The country in which + you are currently may have restrictions on the import, possession, and + use, and/or re-export to another country, of encryption software. + BEFORE using any encryption software, please check the country's laws, + regulations and policies concerning the import, possession, or use, + and re-export of encryption software, to see if this is permitted.</p> + + <p> + <small>Java and all Java-based trademarks are trademarks of + Oracle Corporation in the United States, other countries, or both.</small> + </p> +</body> +</html> diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml index 8d1f3d4..a8a4f29 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory.feature/pom.xml @@ -2,9 +2,11 @@ <!--#======================================================================= --> <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). --> <!--# All rights reserved. This program and the accompanying materials --> -<!--# are made available under the terms of the Eclipse Public License v1.0 --> +<!--# are made available under the terms of the Eclipse Public License 2.0 --> <!--# which accompanies this distribution, and is available at --> -<!--# http://www.eclipse.org/legal/epl-v10.html --> +<!--# https://www.eclipse.org/legal/epl-2.0/ --> +<!--# --> +<!--# SPDX-License-Identifier: EPL-2.0 --> <!--# --> <!--# Contributors: --> <!--# Christophe Loetz (Loetz GmbH&Co.KG) - Initial implementation API and implementation --> diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt index ff42ad4..fc5938d 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/LICENSE.txt @@ -1,161 +1,140 @@ -Eclipse Public License -v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION -OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. -A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate -modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of -its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute -and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code -form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the -combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not -apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no -assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property -rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity -based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and -licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property -rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the -Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to -grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including -warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any -other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it -in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows -subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and -the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes -the Program in a commercial product offering should do so in a manner which does not create potential liability for -other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions -brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual -property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is -then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. -Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to -those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, -the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for -determining the appropriateness of using and distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance -with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or -enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) -alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such -Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or -conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such -noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution -of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement -is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish -new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the -right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including Contributions) may always be -distributed subject to the version of the Agreement under which it was received. In addition, after a new version of -the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the -new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to -the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States -of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause -of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file +Eclipse Foundation Software User Agreement + +November 22, 2017 + +Usage Of Content + +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION +AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF +THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE +TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED +BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED +BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE +AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY +APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU +MAY NOT USE THE CONTENT. + +Applicable Licenses + +Unless otherwise indicated, all Content made available by the Eclipse Foundation +is provided to you under the terms and conditions of the Eclipse Public License +Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also +available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL, +"Program" will mean the Content. + +Content includes, but is not limited to, source code, object code, documentation +and other files maintained in the Eclipse Foundation source code repository +("Repository") in software modules ("Modules") and made available as +downloadable archives ("Downloads"). + +- Content may be structured and packaged into modules to facilitate + delivering, extending, and upgrading the Content. Typical modules may + include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and + features ("Features"). +- Each Plug-in or Fragment may be packaged as a sub-directory or JAR + (Javaâ„¢ ARchive) in a directory named "plugins". +- A Feature is a bundle of one or more Plug-ins and/or Fragments and + associated material. Each Feature may be packaged as a sub-directory in a + directory named "features". Within a Feature, files named "feature.xml" may + contain a list of the names and version numbers of the Plug-ins and/or + Fragments associated with that Feature. +- Features may also include other Features ("Included Features"). Within a + Feature, files named "feature.xml" may contain a list of the names and + version numbers of Included Features. + +The terms and conditions governing Plug-ins and Fragments should be contained in +files named "about.html" ("Abouts"). The terms and conditions governing Features +and Included Features should be contained in files named "license.html" +("Feature Licenses"). Abouts and Feature Licenses may be located in any +directory of a Download or Module including, but not limited to the following +locations: + +- The top-level (root) directory +- Plug-in and Fragment directories +- Inside Plug-ins and Fragments packaged as JARs +- Sub-directories of the directory named "src" of certain Plug-ins +- Feature directories + +Note: if a Feature made available by the Eclipse Foundation is installed using +the Provisioning Technology (as defined below), you must agree to a license +("Feature Update License") during the installation process. If the Feature +contains Included Features, the Feature Update License should either provide you +with the terms and conditions governing the Included Features or inform you +where you can locate them. Feature Update Licenses may be found in the "license" +property of files named "feature.properties" found within a Feature. Such +Abouts, Feature Licenses, and Feature Update Licenses contain the terms and +conditions (or references to such terms and conditions) that govern your use of +the associated Content in that directory. + +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL +OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO): + +- Eclipse Public License Version 1.0 (available at + http://www.eclipse.org/legal/epl-v10.html) +- Eclipse Distribution License Version 1.0 (available at + http://www.eclipse.org/licenses/edl-v1.0.html) +- Common Public License Version 1.0 (available at + http://www.eclipse.org/legal/cpl-v10.html) +- Apache Software License 1.1 (available at + http://www.apache.org/licenses/LICENSE) +- Apache Software License 2.0 (available at + http://www.apache.org/licenses/LICENSE-2.0) +- Mozilla Public License Version 1.1 (available at + http://www.mozilla.org/MPL/MPL-1.1.html) + +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO +USE OF THE CONTENT. If no About, Feature License, or Feature Update License is +provided, please contact the Eclipse Foundation to determine what terms and +conditions govern that particular Content. + +Use of Provisioning Technology + +The Eclipse Foundation makes available provisioning software, examples of which +include, but are not limited to, p2 and the Eclipse Update Manager +("Provisioning Technology") for the purpose of allowing users to install +software, documentation, information and/or other materials (collectively +"Installable Software"). This capability is provided with the intent of allowing +such users to install, extend and update Eclipse-based products. Information +about packaging Installable Software is available at +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification"). + +You may use Provisioning Technology to allow other parties to install +Installable Software. You shall be responsible for enabling the applicable +license agreements relating to the Installable Software to be presented to, and +accepted by, the users of the Provisioning Technology in accordance with the +Specification. By using Provisioning Technology in such a manner and making it +available in accordance with the Specification, you further acknowledge your +agreement to, and the acquisition of all necessary rights to permit the +following: + +1. A series of actions may occur ("Provisioning Process") in which a user may + execute the Provisioning Technology on a machine ("Target Machine") with the + intent of installing, extending or updating the functionality of an + Eclipse-based product. +2. During the Provisioning Process, the Provisioning Technology may cause third + party Installable Software or a portion thereof to be accessed and copied to + the Target Machine. +3. Pursuant to the Specification, you will provide to the user the terms and + conditions that govern the use of the Installable Software ("Installable + Software Agreement") and such Installable Software Agreement shall be + accessed from the Target Machine in accordance with the Specification. Such + Installable Software Agreement must inform the user of the terms and + conditions that govern the Installable Software and must solicit acceptance + by the end user in the manner prescribed in such Installable + Software Agreement. Upon such indication of agreement by the user, the + provisioning Technology will complete installation of the + Installable Software. + +Cryptography + +Content may contain encryption software. The country in which you are currently +may have restrictions on the import, possession, and use, and/or re-export to +another country, of encryption software. BEFORE using any encryption software, +please check the country's laws, regulations and policies concerning the import, +possession, or use, and re-export of encryption software, to see if this is +permitted. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the +United States, other countries, or both. diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF index 0408b6a..1ebe036 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/META-INF/MANIFEST.MF @@ -62,7 +62,8 @@ Require-Bundle: org.slf4j.api;bundle-version="1.7.2", org.eclipse.osbp.bpm;bundle-version="0.9.0", org.eclipse.osbp.bpm.api;bundle-version="0.9.0", org.eclipse.osbp.ecview.dsl;bundle-version="0.9.0", - org.eclipse.osbp.vaaclipse.addons.common.api;bundle-version="0.9.0" + org.eclipse.osbp.vaaclipse.addons.common.api;bundle-version="0.9.0", + mondrian.osgi Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.annotation, javax.validation, @@ -75,6 +76,7 @@ Import-Package: javax.annotation, org.eclipse.osbp.core.api.persistence;version="0.9.0", org.eclipse.osbp.dsl.common.datatypes;version="0.9.0", org.eclipse.osbp.dsl.xtext.builder.participant;version="0.9.0", + org.eclipse.osbp.ecview.extension.strategy.util;version="0.9.0", org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common;version="0.9.0", org.eclipse.osbp.runtime.web.vaadin.common.data;version="0.9.0", org.eclipse.osbp.ui.api.contextfunction;version="0.9.0", diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration.ReportPrinterDialogContextFunction.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration.ReportPrinterDialogContextFunction.xml new file mode 100644 index 0000000..aff9222 --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration.ReportPrinterDialogContextFunction.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration.ReportPrinterDialogContextFunction"> + <property name="service.context.key" value="ReportPrinterDialog"/> + <service> + <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/> + </service> + <implementation class="org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration.ReportPrinterDialogContextFunction"/> +</scr:component>
\ No newline at end of file diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings.SystemSettingsContextFunction.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings.SystemSettingsContextFunction.xml new file mode 100644 index 0000000..209f29e --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings.SystemSettingsContextFunction.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings.SystemSettingsContextFunction"> + <property name="service.context.key" value="SystemSettings"/> + <service> + <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/> + </service> + <implementation class="org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings.SystemSettingsContextFunction"/> +</scr:component>
\ No newline at end of file diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html index 64c0598..e8b834d 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.html @@ -8,13 +8,13 @@ <body lang="EN-US"> <h2>About This Content</h2> -<p>June 1, 2016</p> +<p>November 30, 2017</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties index 5a79185..60ad385 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/about.properties @@ -1,9 +1,11 @@ # # Copyright (c) 2012, 2016 - Loetz GmbH&Co.KG (Heidelberg) # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Loetz GmbH&Co.KG - initial API and implementation @@ -17,9 +19,11 @@ featureName=org.eclipse.osbp.vaaclipse.addons.softwarefactory featureText=\ Copyright (c) 2012-2016 - Loetz GmbH&Co.KG \n\ All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License 2.0 \n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html\n\ +https://www.eclipse.org/legal/epl-2.0/\n\ +\n\ +SPDX-License-Identifier: EPL-2.0\n\ \n\ Contributors:\n\ Loetz GmbH&Co.KG - implementation\n diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-2.0.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-2.0.html new file mode 100644 index 0000000..637a181 --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-2.0.html @@ -0,0 +1,300 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Eclipse Public License - Version 2.0</title> + <style type="text/css"> + body { + margin: 1.5em 3em; + } + h1{ + font-size:1.5em; + } + h2{ + font-size:1em; + margin-bottom:0.5em; + margin-top:1em; + } + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + ul, ol{ + list-style-type:none; + } + </style> + </head> + <body> + <h1>Eclipse Public License - v 2.0</h1> + <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + </p> + <h2 id="definitions">1. DEFINITIONS</h2> + <p>“Contribution” means:</p> + <ul> + <li>a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + </li> + <li> + b) in the case of each subsequent Contributor: + <ul> + <li>i) changes to the Program, and</li> + <li>ii) additions to the Program;</li> + </ul> + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + “originates” from a Contributor if it was added to the Program by such + Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + </li> + </ul> + <p>“Contributor” means any person or entity that Distributes the Program.</p> + <p>“Licensed Patents” mean patent claims licensable by a Contributor which + are necessarily infringed by the use or sale of its Contribution alone + or when combined with the Program. + </p> + <p>“Program” means the Contributions Distributed in accordance with this + Agreement. + </p> + <p>“Recipient” means anyone who receives the Program under this Agreement + or any Secondary License (as applicable), including Contributors. + </p> + <p>“Derivative Works” shall mean any work, whether in Source Code or other + form, that is based on (or derived from) the Program and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. + </p> + <p>“Modified Works” shall mean any work in Source Code or other form that + results from an addition to, deletion from, or modification of the + contents of the Program, including, for purposes of clarity any new file + in Source Code form that contains any contents of the Program. Modified + Works shall not include works that contain only declarations, interfaces, + types, classes, structures, or files of the Program solely in each case + in order to link to, bind by name, or subclass the Program or Modified + Works thereof. + </p> + <p>“Distribute” means the acts of a) distributing or b) making available + in any manner that enables the transfer of a copy. + </p> + <p>“Source Code” means the form of a Program preferred for making + modifications, including but not limited to software source code, + documentation source, and configuration files. + </p> + <p>“Secondary License” means either the GNU General Public License, + Version 2.0, or any later versions of that license, including any + exceptions or additional permissions as identified by the initial + Contributor. + </p> + <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2> + <ul> + <li>a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + </li> + <li>b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, + at the time the Contribution is added by the Contributor, such + addition of the Contribution causes such combination to be covered + by the Licensed Patents. The patent license shall not apply to any + other combinations which include the Contribution. No hardware per + se is licensed hereunder. + </li> + <li>c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the rights + and licenses granted hereunder, each Recipient hereby assumes sole + responsibility to secure any other intellectual property rights needed, + if any. For example, if a third party patent license is required to + allow Recipient to Distribute the Program, it is Recipient's + responsibility to acquire that license before distributing the Program. + </li> + <li>d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + </li> + <li>e) Notwithstanding the terms of any Secondary License, no Contributor + makes additional grants to any Recipient (other than those set forth + in this Agreement) as a result of such Recipient's receipt of the + Program under the terms of a Secondary License (if permitted under + the terms of Section 3). + </li> + </ul> + <h2 id="requirements">3. REQUIREMENTS</h2> + <p>3.1 If a Contributor Distributes the Program in any form, then:</p> + <ul> + <li>a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + </li> + <li> + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + <ul> + <li>i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including warranties + or conditions of title and non-infringement, and implied warranties + or conditions of merchantability and fitness for a particular purpose; + </li> + <li>ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, incidental + and consequential damages, such as lost profits; + </li> + <li>iii) does not attempt to limit or alter the recipients' rights in the + Source Code under section 3.2; and + </li> + <li>iv) requires any subsequent distribution of the Program by any party + to be under a license that satisfies the requirements of this section 3. + </li> + </ul> + </li> + </ul> + <p>3.2 When the Program is Distributed as Source Code:</p> + <ul> + <li>a) it must be made available under this Agreement, or if the Program (i) + is combined with other material in a separate file or files made available + under a Secondary License, and (ii) the initial Contributor attached to + the Source Code the notice described in Exhibit A of this Agreement, + then the Program may be made available under the terms of such + Secondary Licenses, and + </li> + <li>b) a copy of this Agreement must be included with each copy of the Program.</li> + </ul> + <p>3.3 Contributors may not remove or alter any copyright, patent, trademark, + attribution notices, disclaimers of warranty, or limitations of liability + (‘notices’) contained within the Program from any copy of the Program which + they Distribute, provided that Contributors may add their own appropriate + notices. + </p> + <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2> + <p>Commercial distributors of software may accept certain responsibilities + with respect to end users, business partners and the like. While this + license is intended to facilitate the commercial use of the Program, the + Contributor who includes the Program in a commercial product offering should + do so in a manner which does not create potential liability for other + Contributors. Therefore, if a Contributor includes the Program in a + commercial product offering, such Contributor (“Commercial Contributor”) + hereby agrees to defend and indemnify every other Contributor + (“Indemnified Contributor”) against any losses, damages and costs + (collectively “Losses”) arising from claims, lawsuits and other legal actions + brought by a third party against the Indemnified Contributor to the extent + caused by the acts or omissions of such Commercial Contributor in connection + with its distribution of the Program in a commercial product offering. + The obligations in this section do not apply to any claims or Losses relating + to any actual or alleged intellectual property infringement. In order to + qualify, an Indemnified Contributor must: a) promptly notify the + Commercial Contributor in writing of such claim, and b) allow the Commercial + Contributor to control, and cooperate with the Commercial Contributor in, + the defense and any related settlement negotiations. The Indemnified + Contributor may participate in any such claim at its own expense. + </p> + <p>For example, a Contributor might include the Program + in a commercial product offering, Product X. That Contributor is then a + Commercial Contributor. If that Commercial Contributor then makes performance + claims, or offers warranties related to Product X, those performance claims + and warranties are such Commercial Contributor's responsibility alone. + Under this section, the Commercial Contributor would have to defend claims + against the other Contributors related to those performance claims and + warranties, and if a court requires any other Contributor to pay any damages + as a result, the Commercial Contributor must pay those damages. + </p> + <h2 id="warranty">5. NO WARRANTY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is + solely responsible for determining the appropriateness of using and + distributing the Program and assumes all risks associated with its + exercise of rights under this Agreement, including but not limited to the + risks and costs of program errors, compliance with applicable laws, damage + to or loss of data, programs or equipment, and unavailability or + interruption of operations. + </p> + <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2> + <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED + BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY + LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS + GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + </p> + <h2 id="general">7. GENERAL</h2> + <p>If any provision of this Agreement is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of the + remainder of the terms of this Agreement, and without further action by the + parties hereto, such provision shall be reformed to the minimum extent + necessary to make such provision valid and enforceable. + </p> + <p>If Recipient institutes patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Program itself + (excluding combinations of the Program with other software or hardware) + infringes such Recipient's patent(s), then such Recipient's rights granted + under Section 2(b) shall terminate as of the date such litigation is filed. + </p> + <p>All Recipient's rights under this Agreement shall terminate if it fails to + comply with any of the material terms or conditions of this Agreement and + does not cure such failure in a reasonable period of time after becoming + aware of such noncompliance. If all Recipient's rights under this Agreement + terminate, Recipient agrees to cease use and distribution of the Program + as soon as reasonably practicable. However, Recipient's obligations under + this Agreement and any licenses granted by Recipient relating to the + Program shall continue and survive. + </p> + <p>Everyone is permitted to copy and distribute copies of this Agreement, + but in order to avoid inconsistency the Agreement is copyrighted and may + only be modified in the following manner. The Agreement Steward reserves + the right to publish new versions (including revisions) of this Agreement + from time to time. No one other than the Agreement Steward has the right + to modify this Agreement. The Eclipse Foundation is the initial Agreement + Steward. The Eclipse Foundation may assign the responsibility to serve as + the Agreement Steward to a suitable separate entity. Each new version of + the Agreement will be given a distinguishing version number. The Program + (including Contributions) may always be Distributed subject to the version + of the Agreement under which it was received. In addition, after a new + version of the Agreement is published, Contributor may elect to Distribute + the Program (including its Contributions) under the new version. + </p> + <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient + receives no rights or licenses to the intellectual property of any + Contributor under this Agreement, whether expressly, by implication, + estoppel or otherwise. All rights in the Program not expressly granted + under this Agreement are reserved. Nothing in this Agreement is intended + to be enforceable by any entity that is not a Contributor or Recipient. + No third-party beneficiary rights are created under this Agreement. + </p> + <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2> + <p>“This Source Code may also be made available under the following + Secondary Licenses when the conditions for such availability set forth + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), + version(s), and exceptions or additional permissions here}.” + </p> + <blockquote> + <p>Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + </p> + <p>If it is not possible or desirable to put the notice in a particular file, + then You may include the notice in a location (such as a LICENSE file in a + relevant directory) where a recipient would be likely to look for + such a notice. + </p> + <p>You may add additional accurate notices of copyright ownership.</p> + </blockquote> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-v10.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-v10.html deleted file mode 100644 index b398acc..0000000 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/epl-v10.html +++ /dev/null @@ -1,259 +0,0 @@ -<!--?xml version="1.0" encoding="ISO-8859-1" ?--> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -</head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.</p> - -<p class="list">c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.</p> - -<p class="list">d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.</p> - -<p>For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED 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. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p> - -<p><b>7. GENERAL</b></p> - -<p>If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.</p> - -<p>If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.</p> - -<p>All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.</p> - -<p>Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.</p> - -<p>This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.</p> - - - -</body></html>
\ No newline at end of file diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties index ba5fcaf..4fff1b0 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N.properties @@ -1,33 +1,33 @@ #Generated by Eclipse Messages Editor (Eclipse Babel) #default -acceptdelete_description = acceptdelete_description\u0009\u0009\u0009\u0009 +acceptdelete_description = acceptdelete_description -acceptdelete_message = acceptdelete_message\u0009\u0009\u0009\u0009\u0009 +acceptdelete_message = acceptdelete_message -acceptdelete_title = acceptdelete_title\u0009\u0009\u0009\u0009\u0009\u0009 +acceptdelete_title = acceptdelete_title -acceptloosingdata_description = acceptloosingdata_description\u0009\u0009\u0009 +acceptloosingdata_description = acceptloosingdata_description -acceptloosingdata_message = acceptloosingdata_message\u0009\u0009\u0009\u0009 +acceptloosingdata_message = acceptloosingdata_message -acceptloosingdata_title = acceptloosingdata_title\u0009\u0009\u0009\u0009\u0009 +acceptloosingdata_title = acceptloosingdata_title -acceptreload_description = acceptreload_description\u0009\u0009\u0009\u0009 +acceptreload_description = acceptreload_description -acceptreload_message = acceptreload_message\u0009\u0009\u0009\u0009\u0009 +acceptreload_message = acceptreload_message -acceptreload_title = acceptreload_title\u0009\u0009\u0009\u0009\u0009\u0009 +acceptreload_title = acceptreload_title -acceptsave_description = acceptsave_description\u0009\u0009\u0009\u0009 +acceptsave_description = acceptsave_description -acceptsave_message = acceptsave_message\u0009\u0009\u0009\u0009\u0009 +acceptsave_message = acceptsave_message -acceptsave_title = acceptsave_title\u0009\u0009\u0009\u0009\u0009\u0009 +acceptsave_title = acceptsave_title all = all -all_tip = all_tip\u0009 +all_tip = all_tip alt = alt @@ -49,8 +49,12 @@ entity_tip = Choose here which entity data is to be locked or unlocked eq = equal +except_for = except_for + ge = greater equal +groups = groups + gt = greater here_are_some_resources_that_will_help_you_to_get_started = here_are_some_resources_that_will_help_you_to_get_started @@ -63,6 +67,8 @@ javax_validation_constraints_not_null_message = must not be null javax_validation_constraints_past_message = must_be_in_past +javax_validation_constraints_size_message = size is invalid + keybinding_category = keybindingCategory keybinding_context_description = keybindingContextDescription @@ -93,25 +99,25 @@ none = none none_tip = If you press this button then none of the entries will be selected. -options_acceptdelete = options_acceptdelete\u0009\u0009\u0009\u0009\u0009 +options_acceptdelete = options_acceptdelete -options_acceptdelete_description = options_acceptdelete_description\u0009\u0009 +options_acceptdelete_description = options_acceptdelete_description -options_acceptloosingdata = options_acceptloosingdata\u0009\u0009\u0009\u0009 +options_acceptloosingdata = options_acceptloosingdata -options_acceptloosingdata_description = options_acceptloosingdata_description\u0009 +options_acceptloosingdata_description = options_acceptloosingdata_description -options_acceptreload = options_acceptreload\u0009\u0009\u0009\u0009\u0009 +options_acceptreload = options_acceptreload -options_acceptreload_description = options_acceptreload_description\u0009\u0009 +options_acceptreload_description = options_acceptreload_description -options_acceptsave = options_acceptsave\u0009\u0009\u0009\u0009\u0009 +options_acceptsave = options_acceptsave -options_acceptsave_description = options_acceptsave_description\u0009\u0009 +options_acceptsave_description = options_acceptsave_description -options_cancel = options_cancel\u0009\u0009\u0009\u0009\u0009\u0009\u0009 +options_cancel = options_cancel -options_cancel_description = options_cancel_description\u0009\u0009\u0009\u0009 +options_cancel_description = options_cancel_description options_query_delete = options_query_delete @@ -125,6 +131,18 @@ query_delete_title = query_delete_title reset = reset +reset_jpa_cache = resetJPACache + +reset_jpa_cache_tip = reset JPA Cache tip + +reset_mondrian_cache = resetMondrianCache + +reset_mondrian_cache_tip = reset Mondrian cache tip + +reset_user_properties = resetUserProperties + +reset_user_properties_tip = reset user properties tip + save = save save_tip = If you press this button , the current selection is stored . Only the selected items are then visible to the user . If the option is "inverse" is selected, the selected entries are invisible . @@ -151,6 +169,8 @@ username = Username username_tip = Enter the user name for locking or unlocking of the data. +users = users + welcome = welcome yes = yes diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties index e7327fc..8d48d62 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de.properties @@ -1,23 +1,23 @@ #Generated by Eclipse Messages Editor (Eclipse Babel) #de -acceptdelete_description = acceptdelete_description\u0009\u0009\u0009\u0009 +acceptdelete_description = acceptdelete_description -acceptdelete_message = Dieser Datensatz wurde gerade gel\u00F6scht. Wollen Sie diese \u00C4nderung \u00FCbernehmen? \u0009\u0009\u0009 +acceptdelete_message = Dieser Datensatz wurde gerade gel\u00F6scht. Wollen Sie diese \u00C4nderung \u00FCbernehmen? -acceptdelete_title = Achtung\u0009\u0009\u0009\u0009 +acceptdelete_title = Achtung -acceptloosingdata_description = m\u00F6glicher datenverlust\u0009\u0009 +acceptloosingdata_description = m\u00F6glicher datenverlust -acceptloosingdata_message = Ge\u00E4nderte Daten gehen verloren\u0009\u0009\u0009 +acceptloosingdata_message = Ge\u00E4nderte Daten gehen verloren -acceptloosingdata_title = Achtung\u0009\u0009\u0009\u0009 +acceptloosingdata_title = Achtung -acceptreload_description = Datenverlust m\u00F6glich\u0009\u0009\u0009 +acceptreload_description = Datenverlust m\u00F6glich -acceptreload_message = acceptreload_message\u0009\u0009\u0009\u0009\u0009 +acceptreload_message = acceptreload_message -acceptreload_title = acceptreload_title\u0009\u0009\u0009\u0009\u0009\u0009 +acceptreload_title = acceptreload_title acceptsave_description = m\u00F6glicher datenverlust @@ -49,8 +49,12 @@ entity_tip = W\u00E4hlen Sie hier welche Entit\u00E4tsdaten gesperrt oder freige eq = gleich +except_for = + ge = gr\u00F6\u00DFer gleich +groups = Rollen + gt = gr\u00F6\u00DFer here_are_some_resources_that_will_help_you_to_get_started = Hier finden Sie einige Quellen, um Ihnen den Anfang zu erleichtern @@ -63,6 +67,8 @@ javax_validation_constraints_not_null_message = Dieses Attribut darf nicht leer javax_validation_constraints_past_message = Das Datum muss in der Vergangenheit liegen +javax_validation_constraints_size_message = L\u00E4nge der Eingabe stimmt nicht mit Vorgabe \u00FCberein. + keybinding_category = Kategorie keybinding_context_description = Kontextbeschreibung @@ -93,25 +99,25 @@ none = keiner none_tip = Wenn Sie diese Taste dr\u00FCcken, wird keiner der Eintr\u00E4ge ausgew\u00E4hlt werden. -options_acceptdelete = Akzeptiere\u0009\u0009 +options_acceptdelete = Akzeptiere -options_acceptdelete_description = options_acceptdelete_description\u0009\u0009 +options_acceptdelete_description = options_acceptdelete_description -options_acceptloosingdata = Akzeptiere\u0009\u0009 +options_acceptloosingdata = Akzeptiere -options_acceptloosingdata_description = options_acceptloosingdata_description\u0009 +options_acceptloosingdata_description = options_acceptloosingdata_description -options_acceptreload = options_acceptreload\u0009\u0009\u0009\u0009\u0009 +options_acceptreload = options_acceptreload -options_acceptreload_description = options_acceptreload_description\u0009\u0009 +options_acceptreload_description = options_acceptreload_description options_acceptsave = Akzeptiere options_acceptsave_description = options_acceptsave_description -options_cancel = Abbrechen\u0009\u0009\u0009\u0009 +options_cancel = Abbrechen -options_cancel_description = options_cancel_description\u0009\u0009\u0009\u0009 +options_cancel_description = options_cancel_description options_query_delete = l\u00F6schen @@ -125,6 +131,18 @@ query_delete_title = L\u00F6schen reset = R\u00FCcksetzen +reset_jpa_cache = Datenbank zur\u00FCcksetzen + +reset_jpa_cache_tip = Wenn Daten mit externen Werkzeugen ge\u00E4ndert wurden und die Datenbank zwischenspeichert, muss zur\u00FCckgesetzt werden, damit die externe \u00C4nderung in der Anwendung sichtbar wird. + +reset_mondrian_cache = BI zur\u00FCcksetzen + +reset_mondrian_cache_tip = Wenn Daten mit externen Werkzeugen ge\u00E4ndert wurden und die BI zwischenspeichert, muss zur\u00FCckgesetzt werden, damit die externe \u00C4nderung in der Anwendung sichtbar wird. + +reset_user_properties = Oberfl\u00E4che zur\u00FCcksetzen + +reset_user_properties_tip = Wenn Perspektiventeiler, Spaltenanordnungen oder andere Einstellungen ge\u00E4ndert wurden, werden diese gespeichert. Hier k\u00F6nnen diese Einstellungen auf die Ursprungseinstellung zur\u00FCckgesetzt werden. + save = speichern save_tip = Wenn Sie diese Taste dr\u00FCcken, wird die aktuelle Auswahl gespeichert. Nur die ausgew\u00E4hlten Eintr\u00E4ge sind dann f\u00FCr den Benutzer sichtbar. Wenn die Option "umgekehrt" gew\u00E4hlt ist, sind die gew\u00E4hlten Eintr\u00E4ge unsichtbar. @@ -151,6 +169,8 @@ username = Benutzername username_tip = Geben Sie den Benutzernamen ein f\u00FCr den eine Sperrung oder Freigabe der Daten erfolgen soll. +users = Benutzer + welcome = Willkommen yes = ja diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties index c35c13f..45bcb5d 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_de_AT.properties @@ -15,14 +15,20 @@ deleted = eq = +except_for = Au\u00DFer + ge = +groups = + gt = here_are_some_resources_that_will_help_you_to_get_started = javax_validation_constraints_not_null_message = +javax_validation_constraints_size_message = + keybinding_category = keybinding_context_description = @@ -55,6 +61,18 @@ query_delete_title = reset = +reset_jpa_cache = + +reset_jpa_cache_tip = + +reset_mondrian_cache = + +reset_mondrian_cache_tip = + +reset_user_properties = + +reset_user_properties_tip = + saved = search = @@ -65,6 +83,8 @@ start_process_text = unique_attribute_validator_error = +users = + welcome = yes = diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties index da3649b..24d28f2 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en.properties @@ -1,25 +1,25 @@ #Generated by Eclipse Messages Editor (Eclipse Babel) #en -acceptdelete_description = acceptdelete_description\u0009\u0009\u0009\u0009 +acceptdelete_description = acceptdelete_description acceptdelete_message = This record was just deleted. Do you accept this change? -acceptdelete_title = Attention\u0009\u0009\u0009 +acceptdelete_title = Attention -acceptloosingdata_description = loss of data possible\u0009 +acceptloosingdata_description = loss of data possible -acceptloosingdata_message = changed data will be lost\u0009 +acceptloosingdata_message = changed data will be lost -acceptloosingdata_title = Attention\u0009\u0009\u0009 +acceptloosingdata_title = Attention -acceptreload_description = acceptreload_description\u0009\u0009\u0009\u0009 +acceptreload_description = acceptreload_description -acceptreload_message = acceptreload_message\u0009\u0009\u0009\u0009\u0009 +acceptreload_message = acceptreload_message -acceptreload_title = acceptreload_title\u0009\u0009\u0009\u0009\u0009\u0009 +acceptreload_title = acceptreload_title -acceptsave_description = loss of data possible\u0009 +acceptsave_description = loss of data possible acceptsave_message = This record was just changed. Do you accept the changed data? @@ -49,8 +49,12 @@ entity_tip = Choose here which entity data is to be locked or unlocked eq = equal +except_for = Except for + ge = greater equal +groups = Roles + gt = greater here_are_some_resources_that_will_help_you_to_get_started = Here are some resources that will help you to get started @@ -63,6 +67,8 @@ javax_validation_constraints_not_null_message = This attribute must not be empty javax_validation_constraints_past_message = The date must be in past +javax_validation_constraints_size_message = Length doesn't match the constraint given. + keybinding_category = Category keybinding_context_description = Context description @@ -95,23 +101,23 @@ none_tip = If you press this button then none of the entries will be selected. options_acceptdelete = Accept -options_acceptdelete_description = options_acceptdelete_description\u0009\u0009 +options_acceptdelete_description = options_acceptdelete_description -options_acceptloosingdata = Accept\u0009 +options_acceptloosingdata = Accept -options_acceptloosingdata_description = options_acceptloosingdata_description\u0009 +options_acceptloosingdata_description = options_acceptloosingdata_description -options_acceptreload = options_acceptreload\u0009\u0009\u0009\u0009\u0009 +options_acceptreload = options_acceptreload -options_acceptreload_description = options_acceptreload_description\u0009\u0009 +options_acceptreload_description = options_acceptreload_description options_acceptsave = Accept options_acceptsave_description = options_acceptsave_description -options_cancel = Cancel\u0009\u0009\u0009\u0009\u0009\u0009 +options_cancel = Cancel -options_cancel_description = options_cancel_description\u0009\u0009\u0009\u0009 +options_cancel_description = options_cancel_description options_query_delete = delete @@ -125,6 +131,18 @@ query_delete_title = Delete reset = Reset +reset_jpa_cache = Reset database + +reset_jpa_cache_tip = If data has been changed with external tools and the database is cached, it must be reset for the external change to become visible in the application. + +reset_mondrian_cache = Reset BI data + +reset_mondrian_cache_tip = If data was changed with external tools and the BI caches, it must be reset for the external change to be visible in the application. + +reset_user_properties = Reset surface settings + +reset_user_properties_tip = If perspective separators, column arrangements, or other settings have been changed, they will be saved. Here, these settings can be reset to factory setting. + save = save save_tip = If you press this button , the current selection is stored . Only the selected items are then visible to the user . If the option is "inverse" is selected, the selected entries are invisible . @@ -151,6 +169,8 @@ username = Username username_tip = Enter the user name for locking or unlocking of the data. +users = Users + welcome = Welcome yes = yes diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties index bd05123..2b19926 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_en_US.properties @@ -15,14 +15,20 @@ deleted = eq = +except_for = + ge = +groups = + gt = here_are_some_resources_that_will_help_you_to_get_started = javax_validation_constraints_not_null_message = +javax_validation_constraints_size_message = + keybinding_category = keybinding_context_description = @@ -55,6 +61,18 @@ query_delete_title = reset = +reset_jpa_cache = + +reset_jpa_cache_tip = + +reset_mondrian_cache = + +reset_mondrian_cache_tip = + +reset_user_properties = + +reset_user_properties_tip = + saved = search = @@ -65,6 +83,8 @@ start_process_text = unique_attribute_validator_error = +users = + welcome = yes = diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties index 649636b..3a4993a 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/i18n/I18N_fr.properties @@ -1,23 +1,23 @@ #Generated by Eclipse Messages Editor (Eclipse Babel) #fr -acceptdelete_description = acceptdelete_description\u0009\u0009\u0009\u0009 +acceptdelete_description = acceptdelete_description -acceptdelete_message = acceptdelete_message\u0009\u0009\u0009\u0009\u0009 +acceptdelete_message = acceptdelete_message -acceptdelete_title = Attention\u0009\u0009\u0009 +acceptdelete_title = Attention -acceptloosingdata_description = acceptloosingdata_description\u0009\u0009\u0009 +acceptloosingdata_description = acceptloosingdata_description -acceptloosingdata_message = Les donn\u00E9es modifi\u00E9es seront perdues\u0009\u0009\u0009 +acceptloosingdata_message = Les donn\u00E9es modifi\u00E9es seront perdues -acceptloosingdata_title = Attention\u0009\u0009\u0009 +acceptloosingdata_title = Attention -acceptreload_description = acceptreload_description\u0009\u0009\u0009\u0009 +acceptreload_description = acceptreload_description -acceptreload_message = acceptreload_message\u0009\u0009\u0009\u0009\u0009 +acceptreload_message = acceptreload_message -acceptreload_title = acceptreload_title\u0009\u0009\u0009\u0009\u0009\u0009 +acceptreload_title = acceptreload_title all = tout @@ -43,8 +43,12 @@ entity_tip = Choisissez ici quelles donn\u00E9es entit\u00E9 doit \u00EAtre verr eq = \u00E9gale +except_for = Sauf de + ge = plus ou \u00E9gal +groups = R\u00F4les + gt = plus grand here_are_some_resources_that_will_help_you_to_get_started = Voici quelques ressources pour vous aider \u00E0 d\u00E9marrer @@ -57,6 +61,8 @@ javax_validation_constraints_not_null_message = Cet attribut ne peut pas \u00EAt javax_validation_constraints_past_message = La date doit \u00EAtre dans le pass\u00E9 +javax_validation_constraints_size_message = La longueur de l'entr\u00E9e ne correspond pas \u00E0 la sp\u00E9cification. + keybinding_category = Cat\u00E9gorie keybinding_context_description = Description du contexte @@ -87,25 +93,25 @@ none = aucun none_tip = Si vous appuyez sur ce bouton aucune des entr\u00E9es sera s\u00E9lectionn\u00E9 . -options_acceptdelete = Accept\u0009\u0009 +options_acceptdelete = Accept -options_acceptdelete_description = options_acceptdelete_description\u0009\u0009 +options_acceptdelete_description = options_acceptdelete_description -options_acceptloosingdata = Accept\u0009\u0009 +options_acceptloosingdata = Accept -options_acceptloosingdata_description = options_acceptloosingdata_description\u0009 +options_acceptloosingdata_description = options_acceptloosingdata_description -options_acceptreload = options_acceptreload\u0009\u0009\u0009\u0009\u0009 +options_acceptreload = options_acceptreload -options_acceptreload_description = options_acceptreload_description\u0009\u0009 +options_acceptreload_description = options_acceptreload_description options_acceptsave = Accept options_acceptsave_description = options_acceptsave_description -options_cancel = Annuler\u0009\u0009\u0009\u0009\u0009 +options_cancel = Annuler -options_cancel_description = options_cancel_description\u0009\u0009\u0009\u0009 +options_cancel_description = options_cancel_description options_query_delete = supprimer @@ -119,6 +125,18 @@ query_delete_title = Supprimer reset = R\u00E9initialiser +reset_jpa_cache = R\u00E9initialiser base de donn\u00E9es + +reset_jpa_cache_tip = Si les donn\u00E9es ont \u00E9t\u00E9 modifi\u00E9es avec des outils externes et que la base de donn\u00E9es est mise en cache, elle doit \u00EAtre r\u00E9initialis\u00E9e pour que la modification externe devienne visible dans l'application. + +reset_mondrian_cache = R\u00E9initialiser donn\u00E9es de BI + +reset_mondrian_cache_tip = Si les donn\u00E9es ont \u00E9t\u00E9 modifi\u00E9es avec des outils externes et les caches BI, elles doivent \u00EAtre r\u00E9initialis\u00E9es pour que la modification externe soit visible dans l'application. + +reset_user_properties = R\u00E9initialiser interface utilisateur + +reset_user_properties_tip = Si des s\u00E9parateurs de perspective, des arrangements de colonnes ou d'autres param\u00E8tres ont \u00E9t\u00E9 modifi\u00E9s, ils seront sauvegard\u00E9s. Ici, ces param\u00E8tres peuvent \u00EAtre r\u00E9initialis\u00E9s au r\u00E9glage d'origine. + save = sauvegarder save_tip = Si vous appuyez sur ce bouton , la s\u00E9lection en cours est stock\u00E9 . Seuls les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s sont alors visibles \u00E0 l'utilisateur. Si l'option est "invers\u00E9e" est s\u00E9lectionn\u00E9, les entr\u00E9es s\u00E9lectionn\u00E9es sont invisibles . @@ -145,6 +163,8 @@ username = Utilisateur username_tip = Entrez le nom d'utilisateur pour une activation ou la d\u00E9sactivation des donn\u00E9es \u00E0 effectuer. +users = Utilisateur + welcome = Bienvenue yes = oui diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html index 6e579a5..008b801 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/license.html @@ -1,164 +1,189 @@ -<!--?xml version="1.0" encoding="ISO-8859-1" ?--> +<?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <title>Eclipse Foundation Software User Agreement</title> </head> <body lang="EN-US"> -<h2>Eclipse Foundation Software User Agreement</h2> -<p>February 1, 2011</p> - -<h3>Usage Of Content</h3> - -<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - -<h3>Applicable Licenses</h3> - -<p>Unless otherwise indicated, all Content made available by the Eclipse - Foundation is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also - available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. - For purposes of the EPL, "Program" will mean the Content.</p> - -<p>Content includes, but is not limited to, source code, object code, -documentation and other files maintained in the Eclipse Foundation -source code - repository ("Repository") in software modules ("Modules") and made -available as downloadable archives ("Downloads").</p> - -<ul> - <li>Content may be structured and packaged into modules to -facilitate delivering, extending, and upgrading the Content. Typical -modules may include plug-ins ("Plug-ins"), plug-in fragments -("Fragments"), and features ("Features").</li> - <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> - <li>A Feature is a bundle of one or more Plug-ins and/or -Fragments and associated material. Each Feature may be packaged as a -sub-directory in a directory named "features". Within a Feature, files -named "feature.xml" may contain a list of the names and version numbers -of the Plug-ins - and/or Fragments associated with that Feature.</li> - <li>Features may also include other Features ("Included -Features"). Within a Feature, files named "feature.xml" may contain a -list of the names and version numbers of Included Features.</li> -</ul> - -<p>The terms and conditions governing Plug-ins and Fragments should be -contained in files named "about.html" ("Abouts"). The terms and -conditions governing Features and -Included Features should be contained in files named "license.html" -("Feature Licenses"). Abouts and Feature Licenses may be located in any - directory of a Download or Module -including, but not limited to the following locations:</p> - -<ul> - <li>The top-level (root) directory</li> - <li>Plug-in and Fragment directories</li> - <li>Inside Plug-ins and Fragments packaged as JARs</li> - <li>Sub-directories of the directory named "src" of certain Plug-ins</li> - <li>Feature directories</li> -</ul> - -<p>Note: if a Feature made available by the Eclipse Foundation is -installed using the Provisioning Technology (as defined below), you must - agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the -Feature Update License should either provide you with the terms and -conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be -found in the "license" property of files named "feature.properties" -found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the -terms and conditions (or references to such terms and conditions) that -govern your use of the associated Content in -that directory.</p> - -<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. - SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - -<ul> - <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> - <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> - <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> - <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> - <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> - <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> -</ul> - -<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND -CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, -or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions -govern that particular Content.</p> - - -<h3>Use of Provisioning Technology</h3> - -<p>The Eclipse Foundation makes available provisioning software, -examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of -allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This -capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about -packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> - ("Specification").</p> - -<p>You may use Provisioning Technology to allow other parties to install - Installable Software. You shall be responsible for enabling the - applicable license agreements relating to the Installable Software to - be presented to, and accepted by, the users of the Provisioning -Technology - in accordance with the Specification. By using Provisioning -Technology in such a manner and making it available in accordance with -the - Specification, you further acknowledge your agreement to, and the -acquisition of all necessary rights to permit the following:</p> - -<ol> - <li>A series of actions may occur ("Provisioning Process") in -which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, -extending or updating the functionality of an Eclipse-based - product.</li> - <li>During the Provisioning Process, the Provisioning Technology -may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.</li> - <li>Pursuant to the Specification, you will provide to the user -the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable -Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable -Software Agreement must inform the user of the terms and conditions that - govern - the Installable Software and must solicit acceptance by the end -user in the manner prescribed in such Installable Software Agreement. -Upon such - indication of agreement by the user, the provisioning Technology -will complete installation of the Installable Software.</li> -</ol> - -<h3>Cryptography</h3> - -<p>Content may contain encryption software. The country in which you are - currently may have restrictions on the import, possession, and use, -and/or re-export to - another country, of encryption software. BEFORE using any encryption -software, please check the country's laws, regulations and policies -concerning the import, - possession, or use, and re-export of encryption software, to see if -this is permitted.</p> - -<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> - - -</body></html>
\ No newline at end of file + <h2>Eclipse Foundation Software User Agreement</h2> + <p>November 22, 2017</p> + + <h3>Usage Of Content</h3> + + <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, + INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY + THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED + BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS + GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY + APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED + BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT + USE THE CONTENT.</p> + + <h3>Applicable Licenses</h3> + + <p> + Unless otherwise indicated, all Content made available by the Eclipse + Foundation is provided to you under the terms and conditions of the + Eclipse Public License Version 2.0 ("EPL"). A copy of the + EPL is provided with this Content and is also available at <a + href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + For purposes of the EPL, "Program" will mean the Content. + </p> + + <p>Content includes, but is not limited to, source code, object + code, documentation and other files maintained in the Eclipse + Foundation source code repository ("Repository") in software + modules ("Modules") and made available as downloadable + archives ("Downloads").</p> + + <ul> + <li>Content may be structured and packaged into modules to + facilitate delivering, extending, and upgrading the Content. Typical + modules may include plug-ins ("Plug-ins"), plug-in + fragments ("Fragments"), and features + ("Features").</li> + <li>Each Plug-in or Fragment may be packaged as a sub-directory + or JAR (Java™ ARchive) in a directory named + "plugins".</li> + <li>A Feature is a bundle of one or more Plug-ins and/or + Fragments and associated material. Each Feature may be packaged as a + sub-directory in a directory named "features". Within a + Feature, files named "feature.xml" may contain a list of + the names and version numbers of the Plug-ins and/or Fragments + associated with that Feature.</li> + <li>Features may also include other Features ("Included + Features"). Within a Feature, files named + "feature.xml" may contain a list of the names and version + numbers of Included Features.</li> + </ul> + + <p>The terms and conditions governing Plug-ins and Fragments should + be contained in files named "about.html" + ("Abouts"). The terms and conditions governing Features and + Included Features should be contained in files named + "license.html" ("Feature Licenses"). Abouts and + Feature Licenses may be located in any directory of a Download or + Module including, but not limited to the following locations:</p> + + <ul> + <li>The top-level (root) directory</li> + <li>Plug-in and Fragment directories</li> + <li>Inside Plug-ins and Fragments packaged as JARs</li> + <li>Sub-directories of the directory named "src" of + certain Plug-ins</li> + <li>Feature directories</li> + </ul> + + <p>Note: if a Feature made available by the Eclipse Foundation is + installed using the Provisioning Technology (as defined below), you + must agree to a license ("Feature Update License") during + the installation process. If the Feature contains Included Features, + the Feature Update License should either provide you with the terms + and conditions governing the Included Features or inform you where you + can locate them. Feature Update Licenses may be found in the + "license" property of files named + "feature.properties" found within a Feature. Such Abouts, + Feature Licenses, and Feature Update Licenses contain the terms and + conditions (or references to such terms and conditions) that govern + your use of the associated Content in that directory.</p> + + <p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY + REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND + CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT + ARE NOT LIMITED TO):</p> + + <ul> + <li>Eclipse Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>) + </li> + <li>Eclipse Distribution License Version 1.0 (available at <a + href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>) + </li> + <li>Common Public License Version 1.0 (available at <a + href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>) + </li> + <li>Apache Software License 1.1 (available at <a + href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>) + </li> + <li>Apache Software License 2.0 (available at <a + href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) + </li> + <li>Mozilla Public License Version 1.1 (available at <a + href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>) + </li> + </ul> + + <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND + CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, + or Feature Update License is provided, please contact the Eclipse + Foundation to determine what terms and conditions govern that + particular Content.</p> + + + <h3>Use of Provisioning Technology</h3> + + <p> + The Eclipse Foundation makes available provisioning software, examples + of which include, but are not limited to, p2 and the Eclipse Update + Manager ("Provisioning Technology") for the purpose of + allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This + capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about + packaging Installable Software is available at <a + href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> + ("Specification"). + </p> + + <p>You may use Provisioning Technology to allow other parties to + install Installable Software. You shall be responsible for enabling + the applicable license agreements relating to the Installable Software + to be presented to, and accepted by, the users of the Provisioning + Technology in accordance with the Specification. By using Provisioning + Technology in such a manner and making it available in accordance with + the Specification, you further acknowledge your agreement to, and the + acquisition of all necessary rights to permit the following:</p> + + <ol> + <li>A series of actions may occur ("Provisioning + Process") in which a user may execute the Provisioning + Technology on a machine ("Target Machine") with the intent + of installing, extending or updating the functionality of an + Eclipse-based product.</li> + <li>During the Provisioning Process, the Provisioning Technology + may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.</li> + <li>Pursuant to the Specification, you will provide to the user + the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such + Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable + Software Agreement must inform the user of the terms and conditions + that govern the Installable Software and must solicit acceptance by + the end user in the manner prescribed in such Installable Software + Agreement. Upon such indication of agreement by the user, the + provisioning Technology will complete installation of the Installable + Software.</li> + </ol> + + <h3>Cryptography</h3> + + <p>Content may contain encryption software. The country in which + you are currently may have restrictions on the import, possession, and + use, and/or re-export to another country, of encryption software. + BEFORE using any encryption software, please check the country's laws, + regulations and policies concerning the import, possession, or use, + and re-export of encryption software, to see if this is permitted.</p> + + <p> + <small>Java and all Java-based trademarks are trademarks of + Oracle Corporation in the United States, other countries, or both.</small> + </p> +</body> +</html> diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml index 9189cbd..5124a63 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/pom.xml @@ -2,9 +2,11 @@ <!--#======================================================================= --> <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) --> <!--# All rights reserved. This program and the accompanying materials --> -<!--# are made available under the terms of the Eclipse Public License v1.0 --> +<!--# are made available under the terms of the Eclipse Public License 2.0 --> <!--# which accompanies this distribution, and is available at --> -<!--# http://www.eclipse.org/legal/epl-v10.html --> +<!--# https://www.eclipse.org/legal/epl-2.0/ --> +<!--# --> +<!--# SPDX-License-Identifier: EPL-2.0 --> <!--# --> <!--# Contributors: --> <!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation --> diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java index ba13704..7cf25a1 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/Activator.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/administration/ReportPrinterDialogContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/administration/ReportPrinterDialogContextFunction.java new file mode 100644 index 0000000..1d1ecd5 --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/administration/ReportPrinterDialogContextFunction.java @@ -0,0 +1,44 @@ +/* + * + * Copyright (c) 2011 - 2017 - Loetz GmbH & Co KG, 69115 Heidelberg, Germany + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Initial contribution: + * Loetz GmbH & Co. KG + * + */ +package org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration; + +import org.eclipse.e4.core.contexts.ContextInjectionFactory; +import org.eclipse.e4.core.contexts.IContextFunction; +import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.ui.model.application.MApplication; +import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider; +import org.osgi.service.component.annotations.Component; + +/** + * The Class KeyBindingDialogContextFunction. + */ +@Component(service = IContextFunction.class, property = "service.context.key=ReportPrinterDialog") +@SuppressWarnings("all") +public class ReportPrinterDialogContextFunction implements IContextFunction { + + /* (non-Javadoc) + * @see org.eclipse.e4.core.contexts.IContextFunction#compute(org.eclipse.e4.core.contexts.IEclipseContext, java.lang.String) + */ + @Override + public Object compute(IEclipseContext context, String contextKey) { + MApplication application = context.get(MApplication.class); + IEclipseContext appCtx = application.getContext(); + IVaadinDialogProvider provider = ContextInjectionFactory.make(ReportPrinterDialogProvider.class, appCtx); + appCtx.set(IVaadinDialogProvider.class, provider); + return provider; + } + +} diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/administration/ReportPrinterDialogProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/administration/ReportPrinterDialogProvider.java new file mode 100644 index 0000000..4fcffe5 --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/administration/ReportPrinterDialogProvider.java @@ -0,0 +1,217 @@ +/* + * + * Copyright (c) 2011 - 2017 - Loetz GmbH & Co KG, 69115 Heidelberg, Germany + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Initial contribution: + * Loetz GmbH & Co. KG + * + */ +package org.eclipse.osbp.vaaclipse.addons.softwarefactory.administration; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Locale; + +import javax.inject.Inject; + +import org.eclipse.core.commands.CommandManager; +import org.eclipse.core.commands.common.NotDefinedException; +import org.eclipse.e4.ui.model.application.commands.MBindingContext; +import org.eclipse.e4.ui.model.application.commands.MBindingTable; +import org.eclipse.e4.ui.model.application.commands.MCommand; +import org.eclipse.e4.ui.model.application.commands.MKeyBinding; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.osbp.dsl.metadata.service.DSLBuilderParticipant.DSLMetadataService; +import org.eclipse.osbp.ecview.extension.strategy.util.PdfPrintService; +import org.eclipse.osbp.preferences.ProductConfiguration; +import org.eclipse.osbp.preferences.ProductConfigurationPrefs; +import org.eclipse.osbp.runtime.common.i18n.II18nService; +import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider; +import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService; +import org.eclipse.osbp.ui.api.user.IUser; +import org.eclipse.osbp.utils.vaadin.MDXDialog; +import org.eclipse.osbp.vaaclipse.addons.keybinding.IKeyBindingService; +import org.eclipse.osbp.vaadin.emf.api.IModelingContext; +import org.eclipse.osbp.vaadin.emf.data.fields.EObjectComboBox; +import org.eclipse.osbp.xtext.reportdsl.Report; +import org.eclipse.osbp.xtext.reportdsl.ReportDSLPackage; +import org.osgi.service.prefs.BackingStoreException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.vaadin.data.Item; +import com.vaadin.data.Property; +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.util.BeanItemContainer; +import com.vaadin.event.ItemClickEvent; +import com.vaadin.ui.Button; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.Component; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Table; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; + +/** + * The Class KeyBindingDialogProvider. + */ +public class ReportPrinterDialogProvider implements IVaadinDialogProvider, IUser.UserLocaleListener { + + /** The metadata service. */ + @Inject + private IDSLMetadataService dslMetadataService; + + /** The modeling context. */ + @Inject + IModelingContext modelingContext; + + /** The report combo box. */ + private ComboBox reportCombo; + + /** The printer combo box. */ + private ComboBox printerCombo; + + /** The save button */ + private Button saveButton; + + /** The table. */ + private Table table; + + String reportColumn = "report"; + String printerColumn = "printer"; + + private Button deleteButton; + + private static final Logger LOGGER = LoggerFactory.getLogger(ReportPrinterDialogProvider.class); + + @Override + public void localeChanged(Locale locale) { + reportCombo.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "reportLabelText")); + printerCombo.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "printerLabelText")); + table.setColumnHeader("report", dslMetadataService.translate(locale.toLanguageTag(), "report")); + table.setColumnHeader("printer", dslMetadataService.translate(locale.toLanguageTag(), "printer")); + } + + @Override + public Component getDialog() { + VerticalLayout content = new VerticalLayout(); + createView(content); + return content; + } + + @Override + public void createView(VerticalLayout parent) { + parent.setMargin(true); + VerticalLayout innerLayout = new VerticalLayout(); + parent.addComponent(innerLayout); + + // Table - Report to printer binding + table = new Table(); + table.setSelectable(true); + table.setSizeFull(); + table.addContainerProperty(reportColumn, String.class, null); + table.addContainerProperty(printerColumn, String.class, null); + table.addItemClickListener(e -> { + fillCombos(e); + }); + fillTableItems(); + innerLayout.addComponent(table); + + // ComboBox providing the names of all existing reports + reportCombo = new ComboBox(); + reportCombo.setCaption("Reports"); + reportCombo.setImmediate(true); + reportCombo.setSizeFull(); + List<String> result = new ArrayList<>(); + for (EObject eObj : dslMetadataService.getAll(ReportDSLPackage.Literals.REPORT)) { + result.add(((Report)eObj).getName()); + } + reportCombo.addItems(result); + reportCombo.addValueChangeListener(e -> { + enableSaveButton(); + }); + innerLayout.addComponent(reportCombo); + + // ComboBox of all existing printer + printerCombo = new ComboBox(); + printerCombo.setCaption("Printer"); + printerCombo.setImmediate(true); + printerCombo.setSizeFull(); + printerCombo.addItems(PdfPrintService.reLookupPrintServiceNames()); + printerCombo.addValueChangeListener(e -> { + enableSaveButton(); + }); + innerLayout.addComponent(printerCombo); + + HorizontalLayout horizontalLayout = new HorizontalLayout(); + //Save button + saveButton = new Button("Save"); + saveButton.setEnabled(false); + saveButton.addClickListener(e -> { + saveOnProperties(); + table.removeAllItems(); + fillTableItems(); + }); + horizontalLayout.addComponent(saveButton); + //Delete button + deleteButton = new Button("Delete"); + deleteButton.setEnabled(false); + deleteButton.addClickListener(e -> { + deleteOnProperties(); + table.removeAllItems(); + fillTableItems(); + }); + horizontalLayout.addComponent(deleteButton); + innerLayout.addComponent(horizontalLayout); + + } + + private void fillCombos(ItemClickEvent e) { + Item item = e.getItem(); + reportCombo.setValue(item.getItemProperty(reportColumn).getValue()); + printerCombo.setValue(item.getItemProperty(printerColumn).getValue()); + } + + @SuppressWarnings("unchecked") + private void fillTableItems() { + try { + for (String reportName : ProductConfiguration.prefs().getReportPrinterPrefs().keys()) { + Object newItem = table.addItem(); + Item item = table.getItem(newItem); + item.getItemProperty(reportColumn).setValue(reportName); + item.getItemProperty(printerColumn).setValue(ProductConfiguration.prefs().getReportPrinter(reportName)); + } + } catch (UnsupportedOperationException e1) { + LOGGER.error(e1.getMessage(), e1); + } catch (BackingStoreException e1) { + LOGGER.error(e1.getMessage(), e1); + } + } + + private void saveOnProperties() { + String reportName = (String) reportCombo.getValue(); + String printerName = (String) printerCombo.getValue(); + ProductConfiguration.prefs().setReportPrinter(reportName, printerName); + } + + private void deleteOnProperties() { + String reportName = (String) reportCombo.getValue(); + ProductConfiguration.prefs().removeReportPrinter(reportName); + } + + private void enableSaveButton(){ + if ((reportCombo.getValue()!=null) && (printerCombo.getValue()!=null)){ + saveButton.setEnabled(true); + deleteButton.setEnabled(true); + } + } + +} diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java index 376cee0..2832255 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/I18NHandler.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java index 5746424..f22a155 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/PrintServiceHandler.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java index 714e1e2..e4df186 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/StrategyHandler.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java index ac7b93c..f6186cd 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/ThemeHandler.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java index b678971..573e2fb 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/handler/UserHandler.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation @@ -153,7 +155,7 @@ public class UserHandler implements IUser.UserLocaleListener, IEventDispatcher.R @Override public void receiveEvent(EventDispatcherEvent event) { - if(event.getCommand() == EventDispatcherCommand.CLOSE) { + if(event.getTopic().equals("UserMenu") && event.getCommand() == EventDispatcherCommand.CLOSE) { popup.setPopupVisible(false); } } diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogContextFunction.java index 395b045..16e8247 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogContextFunction.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogContextFunction.java @@ -3,9 +3,11 @@ * Copyright (c) 2011 - 2017 - Loetz GmbH & Co KG, 69115 Heidelberg, Germany * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogProvider.java index a3737a6..86f10da 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogProvider.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/keybinding/KeyBindingDialogProvider.java @@ -3,9 +3,11 @@ * Copyright (c) 2011 - 2017 - Loetz GmbH & Co KG, 69115 Heidelberg, Germany * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java index be8e583..0c187f8 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/IMainToolbarProvider.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java index 464c8cf..5929c76 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarContextFunction.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java index 57b6b56..49919a0 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/maintoolbar/MainToolbarProvider.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation @@ -26,6 +28,7 @@ import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl; import org.eclipse.e4.ui.model.application.ui.menu.ItemType; import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem; import org.eclipse.e4.ui.model.application.ui.menu.MToolBar; +import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator; import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl; import org.eclipse.osbp.ui.api.perspective.IPerspectiveProvider; import org.eclipse.osbp.ui.api.themes.EnumCssClass; @@ -33,7 +36,9 @@ import org.eclipse.osbp.ui.api.themes.IThemeResourceService; import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType; import org.eclipse.osbp.vaaclipse.presentation.engine.GenericPresentationEngine; import org.eclipse.osbp.xtext.action.ActionButton; +import org.eclipse.osbp.xtext.action.ActionSpacer; import org.eclipse.osbp.xtext.action.ActionToolbar; +import org.eclipse.osbp.xtext.action.ActionToolbarItem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -177,6 +182,7 @@ public class MainToolbarProvider implements IMainToolbarProvider { toolBar = menuFactory.createToolBar(); toolBar.setElementId(IPerspectiveProvider.E4Constants.TOOLBARCONTROLS + "." + perspectiveId); toolBar.setToBeRendered(true); + eclipseContext.set("TOOLBAR_UUID", toolBar.getElementId()); addToolbarItems(toolBar, toolBarModel); // set handle toolBar.getTransientData().put(PERSPECTIVE_ID, perspectiveId); @@ -231,7 +237,7 @@ public class MainToolbarProvider implements IMainToolbarProvider { * the action uri */ private void addToolbarItems(MToolBar toolBar, ActionToolbar toolBarModel) { - for (ActionButton buttonModel : toolBarModel.getActions()) { + for (ActionToolbarItem buttonModel : toolBarModel.getActions()) { addToolbarItem(buttonModel, toolBar); } } @@ -239,26 +245,36 @@ public class MainToolbarProvider implements IMainToolbarProvider { /** * Adds the toolbar item. * - * @param buttonModel - * the button model + * @param itemModel + * the tool bar item model * @param toolBar * the tool bar * @param actionUri * the action uri */ - private void addToolbarItem(ActionButton buttonModel, MToolBar toolBar) { - MHandledToolItem toolItem = menuFactory.createHandledToolItem(); - toolItem.setType(ItemType.PUSH); + private void addToolbarItem(ActionToolbarItem itemModel, MToolBar toolBar) { + if (itemModel instanceof ActionButton) { + ActionButton buttonModel = (ActionButton)itemModel; + MHandledToolItem toolItem = menuFactory.createHandledToolItem(); + toolItem.setType(ItemType.PUSH); - toolItem.setTooltip(buttonModel.getName()); - toolItem.setIconURI(themeResourceService.getThemeURI(buttonModel.getIconURI(), ThemeResourceType.ICON)); - toolItem.setEnabled(true); - toolItem.setToBeRendered(true); - toolItem.setVisible(true); + toolItem.setTooltip(buttonModel.getName()); + toolItem.setIconURI(themeResourceService.getThemeURI(buttonModel.getIconURI(), ThemeResourceType.ICON)); + toolItem.setEnabled(true); + toolItem.setToBeRendered(true); + toolItem.setVisible(true); - setCommand(buttonModel.getCommand().getName(), toolItem, appModel); - toolItem.setElementId(IPerspectiveProvider.E4Constants.TOOLBARITEM_PREFIX + buttonModel.getName()); - toolBar.getChildren().add(toolItem); + setCommand(buttonModel.getCommand().getName(), toolItem, appModel); + toolItem.setElementId(IPerspectiveProvider.E4Constants.TOOLBARITEM_PREFIX + buttonModel.getName()); + toolBar.getChildren().add(toolItem); + }else if(itemModel instanceof ActionSpacer){ + MToolBarSeparator separatorItem = menuFactory.createToolBarSeparator(); + separatorItem.setToBeRendered(true); + separatorItem.setVisible(true); + separatorItem.setElementId(IPerspectiveProvider.E4Constants.TOOLBARITEM_PREFIX + "_SEPARATOR_" + String.valueOf(toolBar.getChildren().size())); + + toolBar.getChildren().add(separatorItem); + } } private void setCommand(final String commandName, final MHandledToolItem toolItem, final MApplication application) { diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java index bc08808..9081b23 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/package-info.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java index 4619fb2..f799d3b 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/perspective/PerspectiveProvider.java @@ -3,9 +3,11 @@ * Copyright (c) 2011 - 2017 - Loetz GmbH & Co KG, 69115 Heidelberg, Germany * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG @@ -14,6 +16,7 @@ package org.eclipse.osbp.vaaclipse.addons.softwarefactory.perspective; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -22,6 +25,7 @@ import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Named; +import org.eclipse.bpmn2.Bpmn2Package; import org.eclipse.bpmn2.Process; import org.eclipse.bpmn2.Task; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -44,6 +48,8 @@ import org.eclipse.e4.ui.model.application.ui.basic.MStackElement; import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow; import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement; import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl; +import org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl; +import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; @@ -72,6 +78,7 @@ import org.eclipse.osbp.ui.api.perspective.IPerspectiveProvider; import org.eclipse.osbp.ui.api.themes.IThemeResourceService; import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType; import org.eclipse.osbp.ui.api.user.IUser; +import org.eclipse.osbp.utils.vaadin.bpmn.BpmnView; import org.eclipse.osbp.vaaclipse.addons.softwarefactory.maintoolbar.IMainToolbarProvider; import org.eclipse.osbp.vaaclipse.addons.softwarefactory.welcome.WelcomeView; import org.eclipse.osbp.vaaclipse.publicapi.authentication.AuthenticationConstants; @@ -93,7 +100,7 @@ import org.eclipse.osbp.xtext.organizationdsl.Organization; import org.eclipse.osbp.xtext.organizationdsl.OrganizationDSLPackage; import org.eclipse.osbp.xtext.organizationdsl.OrganizationPackage; import org.eclipse.osbp.xtext.perspective.Perspective; -import org.eclipse.osbp.xtext.perspective.PerspectiveBean; +import org.eclipse.osbp.xtext.perspective.PerspectiveBPMN; import org.eclipse.osbp.xtext.perspective.PerspectiveChart; import org.eclipse.osbp.xtext.perspective.PerspectiveDataInterchange; import org.eclipse.osbp.xtext.perspective.PerspectiveDialog; @@ -430,13 +437,9 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN PerspectiveSashContainer sashModel = (PerspectiveSashContainer) element; MPartSashContainer sashContainer = BasicFactoryImpl.eINSTANCE.createPartSashContainer(); sashContainer.setAccessibilityPhrase(sashModel.getAccessibilityPhrase()); - if (sashModel.getContainerData() != null) { - sashContainer.setContainerData(sashModel.getContainerData().replace("\"", "")); - } else { - sashContainer.setContainerData("50"); - } - + addAdapter(sashContainer); sashContainer.setElementId(sashModel.getElementId()); + if ("HORIZONTAL".equals(sashModel.getOrientation().getName())) { sashContainer.setHorizontal(true); } else { @@ -449,6 +452,7 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN } else if (parent instanceof MPartSashContainer) { ((MPartSashContainer) parent).getChildren().add(sashContainer); } + // go deeper traverseModel(sashContainer, element); // set selected references @@ -458,6 +462,17 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN break; } } + + // DON´T MOVE THE FOLLOWING CODE LINES !!!! + // The reading of the container data from the user properties in 'getElementContainerData' below + // requires the element id and the parent information set to the part above. + String elementContainerData = getElementContainerData(sashContainer); + if (elementContainerData != null) { + sashContainer.setContainerData(elementContainerData); + } else { + sashContainer.setContainerData(sashModel.getContainerData()!=null?sashModel.getContainerData().replace("\"", ""):"50"); + } + } /** @@ -473,11 +488,7 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN PerspectivePartStack stackModel = (PerspectivePartStack) element; MPartStack stack = BasicFactoryImpl.eINSTANCE.createPartStack(); stack.setAccessibilityPhrase(stackModel.getAccessibilityPhrase()); - if (stackModel.getContainerData() != null) { - stack.setContainerData(stackModel.getContainerData().replace("\"", "")); - } else { - stack.setContainerData("50"); - } + addAdapter(stack); stack.setElementId(stackModel.getElementId()); stack.setVisible(true); stack.setParent((MElementContainer<MUIElement>) parent); @@ -495,6 +506,21 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN break; } } + + // DON´T MOVE THE FOLLOWING CODE LINES !!!! + // The reading of the container data from the user properties in 'getElementContainerData' below + // requires the element id and the parent information set to the part above. + String elementContainerData = getElementContainerData(stack); + if (elementContainerData != null) { + stack.setContainerData(elementContainerData); + } else { + stack.setContainerData(stackModel.getContainerData()!=null?stackModel.getContainerData().replace("\"", ""):"50"); + } + + } + + private String getElementContainerData(MUIElement element) { + return (String)user.getProperty(getFQNKey(element)); } /** @@ -510,13 +536,9 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN PerspectivePart partModel = (PerspectivePart) element; MPart part = BasicFactoryImpl.eINSTANCE.createPart(); part.setAccessibilityPhrase(partModel.getAccessibilityPhrase()); - if (partModel.getContainerData() != null) { - part.setContainerData(partModel.getContainerData().replace("\"", "")); - } else { - part.setContainerData("50"); - } - + addAdapter(part); part.setElementId(partModel.getElementId()); + part.setIconURI(partModel.getIconURI()); part.setLabel(partModel.getElementId()); part.setVisible(true); @@ -541,6 +563,17 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN if (partModel.getView() != null) { part.setContributionURI(getContributionURI(part, partModel)); } + + // DON´T MOVE THE FOLLOWING CODE LINES !!!! + // The reading of the container data from the user properties in 'getElementContainerData' below + // requires the element id and the parent information set to the part above. + String elementContainerData = getElementContainerData(part); + if (elementContainerData != null) { + part.setContainerData(elementContainerData); + } else { + part.setContainerData(partModel.getContainerData()!=null?partModel.getContainerData().replace("\"", ""):"50"); + } + } /** @@ -579,9 +612,6 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN } else if (viewModel instanceof PerspectiveGrid) { String className = ((PerspectiveGrid) viewModel).getRefTypeJvm().getQualifiedName(); return dslMetadataService.getClassURI(className, IPerspectiveProvider.PerspectiveViewType.TABLE); - } else if (viewModel instanceof PerspectiveBean) { - String className = ((PerspectiveBean) viewModel).getRefTypeJvm().getQualifiedName(); - return dslMetadataService.getClassURI(className, IPerspectiveProvider.PerspectiveViewType.TABLE); } else if (viewModel instanceof PerspectiveChart) { String className = ((PerspectiveChart) viewModel).getRefTypeJvm().getQualifiedName(); return dslMetadataService.getClassURI(className, IPerspectiveProvider.PerspectiveViewType.CHART); @@ -603,6 +633,9 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN } else if (viewModel instanceof PerspectiveDataInterchange) { String className = ((PerspectiveDataInterchange) viewModel).getRefTypeJvm().getQualifiedName(); return dslMetadataService.getClassURI(className, IPerspectiveProvider.PerspectiveViewType.DATAINTERCHANGE); + } else if (viewModel instanceof PerspectiveBPMN) { + String className = BpmnView.class.getCanonicalName(); + return dslMetadataService.getClassURI(className, IPerspectiveProvider.PerspectiveViewType.BPMN); } else if (viewModel instanceof PerspectiveWelcome) { String className = WelcomeView.class.getCanonicalName(); Bundle bundle = FrameworkUtil.getBundle(WelcomeView.class); @@ -645,10 +678,6 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN Table object = ((PerspectiveGrid) viewModel).getRef(); TablePackage pkg = (TablePackage) object.eContainer(); return pkg == null ? "" : toFQN(pkg.getName(), object.getName()); - } else if (viewModel instanceof PerspectiveBean) { - Table object = ((PerspectiveBean) viewModel).getRef(); - TablePackage pkg = (TablePackage) object.eContainer(); - return pkg == null ? "" : toFQN(pkg.getName(), object.getName()); } else if (viewModel instanceof PerspectiveChart) { Chart object = ((PerspectiveChart) viewModel).getRef(); ChartPackage pkg = (ChartPackage) object.eContainer(); @@ -690,8 +719,6 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN return TableDSLPackage.eNS_URI; } else if (viewModel instanceof PerspectiveGrid) { return TableDSLPackage.eNS_URI; - } else if (viewModel instanceof PerspectiveBean) { - return TableDSLPackage.eNS_URI; } else if (viewModel instanceof PerspectiveChart) { return ChartDSLPackage.eNS_URI; } else if (viewModel instanceof PerspectiveReport) { @@ -702,6 +729,8 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN return TopologyDSLPackage.eNS_URI; } else if (viewModel instanceof PerspectiveDialog) { return DialogDSLPackage.eNS_URI; + } else if (viewModel instanceof PerspectiveBPMN) { + return Bpmn2Package.eNS_URI; } else if (viewModel instanceof PerspectiveKanban) { return ExtensionModelPackage.eNS_URI; } else if (viewModel instanceof PerspectiveDataInterchange) { @@ -715,8 +744,6 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN return "table"; } else if (viewModel instanceof PerspectiveGrid) { return "grid"; - } else if (viewModel instanceof PerspectiveBean) { - return "bean"; } return null; } @@ -951,10 +978,13 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN MPerspectiveStack stack = initPerspectiveStack(); if (stack != null && perspectiveFound.perspective != null) { // bring to top if already contained in model - for (MPerspective perspective : stack.getChildren()) { - if ((PerspectiveProvider.toPerspectiveElementId(perspectiveFound.perspective.getName())).equals(perspective.getElementId())) { - modelService.bringToTop(perspective); - return; + // lo wants multiple manually opened perspectives of same type by 02/28/2018 + if(taskId > 0L) { + for (MPerspective perspective : stack.getChildren()) { + if ((PerspectiveProvider.toPerspectiveElementId(perspectiveFound.perspective.getName())).equals(perspective.getElementId())) { + modelService.bringToTop(perspective); + return; + } } } @@ -1033,4 +1063,38 @@ public class PerspectiveProvider implements IPerspectiveProvider, IBPMTaskEventN // awaits a Long object as taskId closePerspective(taskSummary.getId()); } + + private void addAdapter(MUIElement element) { + ((EObject)element).eAdapters().add(new AdapterImpl() { + public void notifyChanged(Notification notification) { + if (notification.getEventType()==Notification.SET && + notification.getFeatureID(UIElementImpl.class) == UiPackageImpl.UI_ELEMENT__CONTAINER_DATA && element.getElementId() != null) + { + user.addToProperties(getFQNKey(element), element.getContainerData()); + } + } + }); + } + + private String getFQNKey(MUIElement element){ + MUIElement muiElement = element; + List<String> elementIds = new LinkedList<>(); + StringBuffer strBuffer = new StringBuffer(); + while (muiElement!= null){ + if (muiElement.getElementId() != null) { + elementIds.add(muiElement.getElementId()); + if (muiElement.getElementId().startsWith(E4Constants.PERSPECTIVE_PREFIX)) { + break; + } + muiElement = muiElement.getParent(); + } + } + for (int i = elementIds.size(); i > 0; i--) { + if (strBuffer.length()!=0){ + strBuffer.append("."); + } + strBuffer.append(elementIds.get(i-1)); + } + return strBuffer.toString(); + } } diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPI18nService.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPI18nService.java index 5f82f48..e573124 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPI18nService.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPI18nService.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java index ef21388..b54e8ca 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPServiceAddon.java @@ -3,9 +3,11 @@ * Copyright (c) 2011 - 2017 - Loetz GmbH & Co KG, 69115 Heidelberg, Germany * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG @@ -21,6 +23,7 @@ import java.util.UUID; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -40,6 +43,7 @@ import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl; import org.eclipse.e4.ui.model.application.ui.menu.MToolControl; import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl; import org.eclipse.equinox.app.IApplicationContext; +import org.eclipse.osbp.bpm.api.IBlipBPMFunctionProvider; import org.eclipse.osbp.core.api.persistence.IPersistenceException; import org.eclipse.osbp.core.api.persistence.IPersistenceService; import org.eclipse.osbp.core.api.persistence.PersistenceExceptionEvent; @@ -234,7 +238,6 @@ public class OSBPServiceAddon implements IPersistenceException.Receiver, IMessag } // add our standard toolcontrols - trimBar.getChildren().add(createToolControl(UserHandler.class)); if (ProductConfiguration.hasDemoToolsLanguage()) { trimBar.getChildren().add(createToolControl(I18NHandler.class)); } @@ -244,6 +247,7 @@ public class OSBPServiceAddon implements IPersistenceException.Receiver, IMessag if (ProductConfiguration.hasToolsPrintService()) { trimBar.getChildren().add(createToolControl(PrintServiceHandler.class)); } + trimBar.getChildren().add(createToolControl(UserHandler.class)); log.debug("toolcontrols added"); } diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java index 42c6f9b..b8d5766 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/OSBPTranslationService.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java index 36290b3..801aac6 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/service/ThemeResourceService.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation @@ -73,10 +75,6 @@ public class ThemeResourceService implements IThemeResourceService { this.appContext = appContext; this.themeEngine = (ThemeEngine)themeEngine; this.themeManager = (ThemeManager)themeManager; - String themeId = appContext.getBrandingProperty("cssTheme"); - if (themeId != null) { - this.themeManager.setTheme(themeId); - } reset(); } diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/systemsettings/SystemSettingsContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/systemsettings/SystemSettingsContextFunction.java new file mode 100644 index 0000000..93cfb88 --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/systemsettings/SystemSettingsContextFunction.java @@ -0,0 +1,43 @@ +/* + * + * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Initial contribution: + * Loetz GmbH & Co. KG + * + */ +package org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings; + +import org.eclipse.e4.core.contexts.ContextInjectionFactory; +import org.eclipse.e4.core.contexts.IContextFunction; +import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.ui.model.application.MApplication; +import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider; +import org.osgi.service.component.annotations.Component; + +/** + * The Class UserFilterMenuContextFunction. + */ +@Component(service = IContextFunction.class, property = "service.context.key=SystemSettings") +@SuppressWarnings("all") +public class SystemSettingsContextFunction implements IContextFunction { + + /* (non-Javadoc) + * @see org.eclipse.e4.core.contexts.IContextFunction#compute(org.eclipse.e4.core.contexts.IEclipseContext, java.lang.String) + */ + @Override + public Object compute(final IEclipseContext context, final String contextKey) { + MApplication application = context.get(MApplication.class); + IEclipseContext appCtx = application.getContext(); + IVaadinDialogProvider provider = ContextInjectionFactory.make(SystemSettingsDialogProvider.class, appCtx); + appCtx.set(IVaadinDialogProvider.class, provider); + return provider; + } +} diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/systemsettings/SystemSettingsDialogProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/systemsettings/SystemSettingsDialogProvider.java new file mode 100644 index 0000000..24746cb --- /dev/null +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/systemsettings/SystemSettingsDialogProvider.java @@ -0,0 +1,236 @@ +/* + * + * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Initial contribution: + * Loetz GmbH & Co. KG + * + */ +package org.eclipse.osbp.vaaclipse.addons.softwarefactory.systemsettings; + +import java.util.Locale; + +import javax.inject.Inject; + +import org.eclipse.osbp.core.api.persistence.IPersistenceService; +import org.eclipse.osbp.ui.api.contextfunction.IVaadinDialogProvider; +import org.eclipse.osbp.ui.api.metadata.IDSLMetadataService; +import org.eclipse.osbp.ui.api.user.IUser; +import org.eclipse.osbp.vaadin.emf.api.IModelingContext; + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Component; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.VerticalLayout; + +/** + * The Class UserFilterDialogProvider enables to inject a filter on runtime data + * into the dto service. + */ +public class SystemSettingsDialogProvider implements IVaadinDialogProvider, IUser.UserLocaleListener { + /** The persistence service. */ + @Inject + private IPersistenceService persistenceService; + + /** The modeling context. */ + @Inject + IModelingContext modelingContext; + + /** The reset for mondrian cache. */ + private Button resetMondrianCache; + + /** The reset for jpa cache. */ + private Button resetJpaCache; + + /** The reset for user properties. */ + private Button resetUserProperties; + + /** The metadata service. */ + @Inject + private IDSLMetadataService dslMetadataService; + + /** The user. */ + @Inject + private IUser user; + + /** + * The listener interface for receiving resetMondrianCacheClick events. The + * class that is interested in processing a resetMondrianCacheClick event + * implements this interface, and the object created with that class is + * registered with a component using the component's + * <code>addResetMondrianCacheClickListener<code> method. When the + * resetMondrianCacheClick event occurs, that object's appropriate method is + * invoked. + * + * @see ResetMondrianCacheClickEvent + */ + private class ResetMondrianCacheClickListener implements ClickListener { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /* + * (non-Javadoc) + * + * @see + * com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button + * .ClickEvent) + */ + @Override + public void buttonClick(ClickEvent event) { + persistenceService.clearMondrianCache(); + } + } + + /** + * The listener interface for receiving resetJpaCacheClick events. The + * class that is interested in processing a resetJpaCacheClick event + * implements this interface, and the object created with that class is + * registered with a component using the component's + * <code>addResetJpaCacheClickListener<code> method. When the + * resetJpaCacheClick event occurs, that object's appropriate method is + * invoked. + * + * @see ResetJpaCacheClickEvent + */ + private class ResetJpaCacheClickListener implements ClickListener { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /* + * (non-Javadoc) + * + * @see + * com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button + * .ClickEvent) + */ + @Override + public void buttonClick(ClickEvent event) { + persistenceService.clearJpaCache(); + } + } + + /** + * The listener interface for receiving resetUserPropertiesClick events. The + * class that is interested in processing a resetUserPropertiesClick event + * implements this interface, and the object created with that class is + * registered with a component using the component's + * <code>addResetUserPropertiesClickListener<code> method. When the + * resetUserPropertiesClick event occurs, that object's appropriate method is + * invoked. + * + * @see ResetUserPropertiesClickEvent + */ + private class ResetUserPropertiesClickListener implements ClickListener { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /* + * (non-Javadoc) + * + * @see + * com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button + * .ClickEvent) + */ + @Override + public void buttonClick(ClickEvent event) { + user.clearFromProperties(); + user.persistProperties(); + } + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.osbp.ui.api.contextfunction.IUserFilterDialogProvider# + * getDialog() + */ + @Override + public Component getDialog() { + VerticalLayout content = new VerticalLayout(); + createView(content); + return content; + } + + /** + * Creates the view. + * + * @param parent + * the parent + */ + @Override + public void createView(VerticalLayout parent) { + parent.setSpacing(true); + parent.setMargin(true); + parent.setSizeFull(); + parent.setPrimaryStyleName("osbp"); + + HorizontalLayout buttonArea = new HorizontalLayout(); + buttonArea.addStyleName("systemSettingsButtonArea"); + buttonArea.setSizeFull(); + parent.setSpacing(true); + buttonArea.setMargin(true); + buttonArea.setSpacing(true); + parent.addComponent(buttonArea); + + resetUserProperties = new Button("reset_user_properties"); + resetUserProperties.setSizeFull(); + resetUserProperties.setImmediate(true); + resetUserProperties.setEnabled(true); + buttonArea.addComponent(resetUserProperties); + + resetMondrianCache = new Button("reset_mondrian_cache"); + resetMondrianCache.setSizeFull(); + resetMondrianCache.setImmediate(true); + resetMondrianCache.setEnabled(true); + buttonArea.addComponent(resetMondrianCache); + + resetJpaCache = new Button("reset_jpa_cache"); + resetJpaCache.setSizeFull(); + resetJpaCache.setImmediate(true); + resetJpaCache.setEnabled(true); + buttonArea.addComponent(resetJpaCache); + + // Listener + resetUserProperties.addClickListener(new ResetUserPropertiesClickListener()); + resetMondrianCache.addClickListener(new ResetMondrianCacheClickListener()); + resetJpaCache.addClickListener(new ResetJpaCacheClickListener()); + user.addUserLocaleListener(this); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.osbp.vaaclipse.publicapi.authentication.IUser. + * UserLocaleListener#localeChanged(java.util.Locale) + */ + @Override + public void localeChanged(Locale locale) { + resetUserProperties.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "reset_user_properties")); + resetUserProperties.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "reset_user_properties_tip")); + resetMondrianCache.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "reset_mondrian_cache")); + resetMondrianCache.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "reset_mondrian_cache_tip")); + resetJpaCache.setCaption(dslMetadataService.translate(locale.toLanguageTag(), "reset_jpa_cache")); + resetJpaCache.setDescription(dslMetadataService.translate(locale.toLanguageTag(), "reset_jpa_cache_tip")); + } + + // -------------------------------------------------------- + +} diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java index 5ad23c5..dc84965 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterContextFunction.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java index 1be18e9..0787a49 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/userfilter/UserFilterDialogProvider.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Initial contribution: * Loetz GmbH & Co. KG diff --git a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java index 5358ee0..ff62d6b 100644 --- a/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java +++ b/org.eclipse.osbp.vaaclipse.addons.softwarefactory/src/org/eclipse/osbp/vaaclipse/addons/softwarefactory/welcome/WelcomeView.java @@ -3,9 +3,11 @@ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) * * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation @@ -2,9 +2,11 @@ <!--#======================================================================= --> <!--# Copyright (c) 2015 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) --> <!--# All rights reserved. This program and the accompanying materials --> -<!--# are made available under the terms of the Eclipse Public License v1.0 --> +<!--# are made available under the terms of the Eclipse Public License 2.0 --> <!--# which accompanies this distribution, and is available at --> -<!--# http://www.eclipse.org/legal/epl-v10.html --> +<!--# https://www.eclipse.org/legal/epl-2.0/ --> +<!--# --> +<!--# SPDX-License-Identifier: EPL-2.0 --> <!--# --> <!--# Contributors: --> <!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation --> @@ -101,13 +103,4 @@ </plugins> </pluginManagement> </build> - <dependencies> - <dependency> - <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId> - org.eclipse.osbp.dependencies.bundle.activemq.all.osgi - </artifactId> - <version>5.14.5-SNAPSHOT</version> - </dependency> - </dependencies> </project> |