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>
diff --git a/LICENSE.txt b/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/about.html b/about.html
index 64c0598..e8b834d 100644
--- a/about.html
+++ b/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 (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 925d886..001d70d 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                           -->
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>
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
 
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
 
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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>
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). 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>
+	<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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; will mean the Content.</p>
+	<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 (&quot;EPL&quot;). 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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</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 &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; 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 (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). 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 &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
+	<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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>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 (&quot;Feature Update License&quot;) 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
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; 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>
+	<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>
+	<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>
+	<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>
+	<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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</p>
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). 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>
+		(&quot;Specification&quot;).
+	</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>
+	<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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
+	<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>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>
+	<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.runtime.tests/LICENSE.txt b/org.eclipse.osbp.runtime.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.tests/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.tests/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.tests/META-INF/MANIFEST.MF b/org.eclipse.osbp.runtime.tests/META-INF/MANIFEST.MF
index 05b9546..5fff1ff 100644
--- a/org.eclipse.osbp.runtime.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.runtime.tests/META-INF/MANIFEST.MF
@@ -37,7 +37,8 @@
  org.eclipse.osbp.dsl.datatype.lib;bundle-version="0.9.0",
  org.eclipse.persistence.core,
  org.eclipse.persistence.jpa;bundle-version="2.6.1",
- org.apache.derby;bundle-version="10.11.1"
+ org.apache.derby;bundle-version="10.11.1",
+ org.eclipse.osbp.jpa.services;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse OSBP
 Bundle-Localization: plugin
diff --git a/org.eclipse.osbp.runtime.tests/META-INF/persistence.xml b/org.eclipse.osbp.runtime.tests/META-INF/persistence.xml
index 0b31730..cd02123 100644
--- a/org.eclipse.osbp.runtime.tests/META-INF/persistence.xml
+++ b/org.eclipse.osbp.runtime.tests/META-INF/persistence.xml
@@ -7,6 +7,12 @@
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
 		<class>org.osbp.tests.entities.BaseID</class>
 		<class>org.osbp.tests.entities.BaseUUID</class>
+	
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+	</persistence-unit>
+	<persistence-unit name="businessdata" 
+		transaction-type="RESOURCE_LOCAL">
+		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
 		<class>org.osbp.tests.entities.DtoTestParent</class>
 		<class>org.osbp.tests.entities.DtoTestChildContainment</class>
 		<class>org.osbp.tests.entities.DtoTestChildCrossRef</class>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.AddressDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.AddressDtoService.xml
index 3651507..3370ce2 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.AddressDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.AddressDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.AddressDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.addressdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseIDDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseIDDtoService.xml
index 5d1f611..546fec9 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseIDDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseIDDtoService.xml
@@ -14,4 +14,6 @@
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseUUIDDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseUUIDDtoService.xml
index 77002af..2f2bf61 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseUUIDDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.BaseUUIDDtoService.xml
@@ -14,4 +14,6 @@
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentDtoService.xml
index fd323f0..578461c 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CashPaymentDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.cashpaymentdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentMethodDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentMethodDtoService.xml
index c86e181..bf7a3a1 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentMethodDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPaymentMethodDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CashPaymentMethodDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.cashpaymentmethoddtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPositionDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPositionDtoService.xml
index a29ee10..8ef5126 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPositionDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashPositionDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CashPositionDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.cashpositiondtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashRegisterDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashRegisterDtoService.xml
index b82f938..76b3479 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashRegisterDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashRegisterDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CashRegisterDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.cashregisterdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashSlipDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashSlipDtoService.xml
index 910fa01..2eb8842 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashSlipDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CashSlipDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CashSlipDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.cashslipdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyDtoService.xml
index 0a54b09..65fa42c 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CompanyDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.companydtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyGroupDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyGroupDtoService.xml
index 494d99a..bf271c2 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyGroupDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyGroupDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CompanyGroupDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.companygroupdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyRelationTypeDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyRelationTypeDtoService.xml
index fe0be54..be83807 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyRelationTypeDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.CompanyRelationTypeDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.CompanyRelationTypeDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.companyrelationtypedtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DepartmentDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DepartmentDtoService.xml
index 005bf31..0c13f80 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DepartmentDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DepartmentDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.DepartmentDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.departmentdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildContainmentDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildContainmentDtoService.xml
index 2ea45ec..1ea529a 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildContainmentDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildContainmentDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.DtoTestChildContainmentDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.dtotestchildcontainmentdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildCrossRefDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildCrossRefDtoService.xml
index 595518f..09c64b9 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildCrossRefDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestChildCrossRefDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.DtoTestChildCrossRefDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.dtotestchildcrossrefdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestParentDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestParentDtoService.xml
index a67affe..8f01e92 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestParentDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.DtoTestParentDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.DtoTestParentDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.dtotestparentdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.McustomerDtoService.xml b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.McustomerDtoService.xml
index 6201431..b18ef86 100644
--- a/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.McustomerDtoService.xml
+++ b/org.eclipse.osbp.runtime.tests/OSGI-INF/org.osbp.tests.dtos.service.McustomerDtoService.xml
@@ -6,12 +6,12 @@
        </service>
        <property name="dto" type="String" value="org.osbp.tests.dtos.McustomerDto"/>
        <property name="service.pid" type="String" value="org.osbp.tests.dtos.service.mcustomerdtoservice"/>
-<reference name="emf" interface="javax.persistence.EntityManagerFactory" cardinality="1..1" 
-	policy="dynamic" bind="bindEmf" unbind="unbindEmf" />
 <reference name="mapperAccess" interface="org.eclipse.osbp.dsl.dto.lib.IMapperAccess" cardinality="1..1" 
 	policy="dynamic" bind="bindMapperAccess" unbind="unbindMapperAccess"/>
 <reference name="filterEnhancers" interface="org.eclipse.osbp.runtime.common.filter.IFilterEnhancer" cardinality="0..n"
 		policy="dynamic" bind="addFilterEnhancer" unbind="removeFilterEnhancer"/>
 <reference name="sessionManager" interface="org.eclipse.osbp.runtime.common.session.ISessionManager" cardinality="1..1"
 					policy="dynamic" bind="bindSessionManager" unbind="unbindSessionManager"/>
+<reference name="validators" interface="org.eclipse.osbp.runtime.common.validation.IValidationParticipant" cardinality="0..n"
+	policy="dynamic" bind="addValidationParticipant" unbind="removeValidationParticipant"/>
 </scr:component>
diff --git a/org.eclipse.osbp.runtime.tests/models/mysmartshop.datatype b/org.eclipse.osbp.runtime.tests/models/mysmartshop.datatype
index 1ef90d2..c4e2e18 100644
--- a/org.eclipse.osbp.runtime.tests/models/mysmartshop.datatype
+++ b/org.eclipse.osbp.runtime.tests/models/mysmartshop.datatype
@@ -30,26 +30,26 @@
 
 	datatype Timestamp dateType timestamp
 	datatype PaymentMethod jvmType String
-    datatype boolean jvmType java.lang.Boolean as primitive;
-    datatype short jvmType java.lang.Short as primitive;
-    datatype int jvmType java.lang.Integer as primitive;
-    datatype long jvmType java.lang.Long as primitive;
-    datatype double jvmType java.lang.Double as primitive;
-    datatype float jvmType java.lang.Float as primitive;
-    datatype character jvmType java.lang.Character as primitive;
-    datatype byte jvmType java.lang.Byte as primitive;
+    datatype boolean jvmType java.lang.Boolean asPrimitive
+    datatype short jvmType java.lang.Short asPrimitive
+    datatype int jvmType java.lang.Integer asPrimitive
+    datatype long jvmType java.lang.Long asPrimitive
+    datatype double jvmType java.lang.Double asPrimitive
+    datatype float jvmType java.lang.Float asPrimitive
+    datatype character jvmType java.lang.Character asPrimitive
+    datatype byte jvmType java.lang.Byte asPrimitive
 
-    datatype Boolean jvmType java.lang.Boolean;
-    datatype Short jvmType java.lang.Short;
-    datatype Int jvmType java.lang.Integer;
-    datatype Long jvmType java.lang.Long;
-    datatype Double jvmType java.lang.Double;
-    datatype Float jvmType java.lang.Float;
-    datatype Character jvmType java.lang.Character;
-    datatype Byte jvmType java.lang.Byte;
-    datatype BigDecimal jvmType java.math.BigDecimal;
+    datatype Boolean jvmType java.lang.Boolean
+    datatype Short jvmType java.lang.Short
+    datatype Int jvmType java.lang.Integer
+    datatype Long jvmType java.lang.Long
+    datatype Double jvmType java.lang.Double
+    datatype Float jvmType java.lang.Float
+    datatype Character jvmType java.lang.Character
+    datatype Byte jvmType java.lang.Byte
+    datatype BigDecimal jvmType java.math.BigDecimal
 
-    datatype String jvmType java.lang.String;
+    datatype String jvmType java.lang.String
 	datatype BlobMapping jvmType java.lang.String 
 		properties (
 			key="Blob" value="2"
@@ -62,18 +62,18 @@
 			 * value="5" name="big" resolution="200x-1"
 			 * 			 
 			 */
-		);
+		)
 
 	datatype notnullString jvmType String isNotNull [severity=error]	
-	datatype Date dateType date;
-	datatype Price jvmType Double properties(key="decimalformat" value="###,##0.00 &curren;");
-	datatype DateOnly dateType date properties(key = "Date" value = "Day");
-	datatype BirthDate dateType date isNotNull isPast  [severity=error] properties(key = "Date" value = "Day");
-	datatype Time dateType time;
-	datatype blobtype as blob;
-	datatype clobtype as blob;
-	datatype NumberToUomo jvmType java.lang.Double;
-	datatype TextArea jvmType java.lang.String properties(key = "TextArea" value = "5"); // used for TextArea
+	datatype Date dateType date
+	datatype Price jvmType Double properties(key="decimalformat" value="###,##0.00 &curren")
+	datatype DateOnly dateType date properties(key = "Date" value = "Day")
+	datatype BirthDate dateType date isNotNull isPast  [severity=error] properties(key = "Date" value = "Day")
+	datatype Time dateType time
+	datatype blobtype asBlob
+	datatype clobtype asBlob
+	datatype NumberToUomo jvmType java.lang.Double
+	datatype TextArea jvmType java.lang.String properties(key = "TextArea" value = "5") // used for TextArea
 
 	/**
      * The RichText_Short datatype represents the attribute as a RichTextArea. 
@@ -81,19 +81,19 @@
      * If you need to hold bigger data, then use the #RichText_Long.   
      */
  	datatype RichText_Short jvmType String
-  		properties(key = "type" value = "richTextArea");
+  		properties(key = "type" value = "richTextArea")
 	/**
      * The RichText datatype represents the attribute as a RichTextArea. 
      * The type in the data model will be a Blob. 
      */
- 	datatype RichText_Long as blob
-  		properties(key = "type" value = "richTextArea");
+ 	datatype RichText_Long asBlob
+  		properties(key = "type" value = "richTextArea")
 	/**
      * The Password datatype represents the attribute as a PasswordField. 
      * The type in the data model will be a String. 
    	 */
  	datatype Password jvmType String
-  		properties(key = "type" value = "password");
+  		properties(key = "type" value = "password")
   		
   	/**
      * The MaskedText datatype represents the attribute as a MaskedTextField. 
@@ -103,7 +103,7 @@
      * <code>var MaskedText text properties (key="mask" value="UUU-###")</code>
      */
  	datatype MaskedText jvmType String
-  		properties(key = "type" value = "maskedText");
+  		properties(key = "type" value = "maskedText")
   		
 	/**
      * The MaskedDecimal datatype represents the attribute as a MaskedDecimalField. 
@@ -113,50 +113,50 @@
      * <code>var MaskedDecimal dec properties (key="mask" value="#,#00.000")</code>
      */
  	datatype MaskedText jvmType String
-  		properties(key = "type" value = "maskedDecimal");
+  		properties(key = "type" value = "maskedDecimal")
   		
   	/**
      * The MaskedText datatype represents the attribute as a MaskedTextField. 
      * The type in the data model will be a String. 
      */
  	datatype MaskedDecimal jvmType String
-  		properties(key = "type" value = "maskedDecimal");
+  		properties(key = "type" value = "maskedDecimal")
 
-	datatype PriceCustomDecimal jvmType java.lang.Double as primitive
+	datatype PriceCustomDecimal jvmType java.lang.Double asPrimitive
 		properties (
 			key="functionCss" value="org.osbp.mysmartshop.functionlibrary.CssStyler.priceEndCss99", 
 			key="functionConverter" value="org.osbp.mysmartshop.functionlibrary.Formatter.currencyFormatter"
-		);
+		)
 	
-	datatype LengthCustomDecimal jvmType java.lang.Double as primitive
+	datatype LengthCustomDecimal jvmType java.lang.Double asPrimitive
 		properties (
 			key="functionCss" value="org.osbp.mysmartshop.functionlibrary.CssStyler.priceEndCss95", 
 			key="functionConverter" value="org.osbp.mysmartshop.functionlibrary.UomoConverter" 
-		);
+		)
 		
-	datatype LengthMetricCustomDecimal jvmType java.lang.Double as primitive
+	datatype LengthMetricCustomDecimal jvmType java.lang.Double asPrimitive
 		properties (
 			key="functionCss" value="org.osbp.mysmartshop.functionlibrary.CssStyler.priceEndCss95", 
 			key="functionConverter" value="org.osbp.mysmartshop.functionlibrary.UomoCMConverter" 
-		);
+		)
 	
-	datatype LengthCMMetricCustomDecimal jvmType java.lang.Double as primitive
+	datatype LengthCMMetricCustomDecimal jvmType java.lang.Double asPrimitive
 		properties (
 			key="functionConverter" value="org.osbp.mysmartshop.functionlibrary.UomoCMMetricConverter" 
-		);
+		)
 	
-	datatype MassGRAMMetricCustomDecimal jvmType java.lang.Double as primitive
+	datatype MassGRAMMetricCustomDecimal jvmType java.lang.Double asPrimitive
 		properties (
 			key="functionConverter" value="org.osbp.mysmartshop.functionlibrary.UomoGRAMMetricConverter" 
-		);
+		)
 	
 //	// UOMo data types, which are available through de.compex.utils.uomo
-//	datatype Length jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Length>;
-//	datatype Area jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Area>;
-//	datatype Volume jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Volume>;
-//	datatype Mass jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Mass>;
+//	datatype Length jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Length>
+//	datatype Area jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Area>
+//	datatype Volume jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Volume>
+//	datatype Mass jvmType org.eclipse.uomo.units.impl.BaseAmount<org.unitsofmeasurement.quantity.Mass>
 //	// joda money types
-//	datatype Money jvmType org.joda.money.Money;
-//	datatype BigMoney jvmType org.joda.money.BigMoney;
+//	datatype Money jvmType org.joda.money.Money
+//	datatype BigMoney jvmType org.joda.money.BigMoney
 		
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.runtime.tests/models/mysmartshop.dto b/org.eclipse.osbp.runtime.tests/models/mysmartshop.dto
index 4a26227..f5cfd45 100644
--- a/org.eclipse.osbp.runtime.tests/models/mysmartshop.dto
+++ b/org.eclipse.osbp.runtime.tests/models/mysmartshop.dto
@@ -1,3 +1,4 @@
+
 import ns org.osbp.tests.entities.BaseID
 import ns org.osbp.tests.entities.BaseUUID
 import ns org.osbp.tests.entities.DtoTestParent
@@ -16,171 +17,171 @@
 import ns org.osbp.tests.entities.Address
 import ns org.osbp.tests.entities.Department
 package org.osbp.tests.dtos {
+
 	autoDto BaseIDDto wraps BaseID {
 
-		inherit var ^id
+		inheritVar id
 	}
 
 	autoDto BaseUUIDDto wraps BaseUUID {
 
-		inherit var ^id
+		inheritVar id
 	}
 
 	autoDto DtoTestParentDto extends BaseUUIDDto wraps DtoTestParent {
 
-		inherit var string
-		inherit ref containmentChilds mapto DtoTestChildContainmentDto
-		inherit ref crossRefChilds mapto DtoTestChildCrossRefDto
-		inherit ref crossRefChild mapto DtoTestChildCrossRefDto
-		inherit var beanx mapto DtoTestBeanDto
+		inheritVar string
+		inheritRef containmentChilds mapto DtoTestChildContainmentDto
+		inheritRef crossRefChilds mapto DtoTestChildCrossRefDto
+		inheritRef crossRefChild mapto DtoTestChildCrossRefDto
+		inheritVar beanx mapto DtoTestBeanDto
 	}
 
 	autoDto DtoTestChildContainmentDto extends BaseUUIDDto wraps DtoTestChildContainment {
 
-		inherit ref container mapto DtoTestParentDto
+		inheritRef container mapto DtoTestParentDto
 	}
 
 	autoDto DtoTestChildCrossRefDto extends BaseUUIDDto wraps DtoTestChildCrossRef {
 
-		inherit ref container mapto DtoTestParentDto
+		inheritRef container mapto DtoTestParentDto
 	}
 
 	autoDto DtoTestBeanDto wraps DtoTestBean {
 
-		inherit var foo
-		inherit ref crossRefChild mapto DtoTestChildCrossRefDto
+		inheritVar foo
+		inheritRef crossRefChild mapto DtoTestChildCrossRefDto
 	}
 
 	autoDto McustomerDto extends BaseIDDto wraps Mcustomer {
 
-		inherit var account_num
-		inherit var lname
-		inherit var fname
-		inherit var mi
-		inherit var address1
-		inherit var address2
-		inherit var address3
-		inherit var address4
-		inherit var city
-		inherit var state_province
-		inherit var postal_code
-		inherit var country
-		inherit var phone1
-		inherit var phone2
-		inherit var birthdate
-		inherit var marital_status
-		inherit var yearly_income
-		inherit var gender
-		inherit var total_children
-		inherit var num_children_at_home
-		inherit var education
-		inherit var date_accnt_opened
-		inherit var member_card
-		inherit var occupation
-		inherit var houseowner
-		inherit var num_cars_owned
-		inherit var fullname
-		inherit var test
-		inherit ref slips mapto CashSlipDto
-		inherit var foo
+		inheritVar account_num
+		inheritVar lname
+		inheritVar fname
+		inheritVar mi
+		inheritVar address1
+		inheritVar address2
+		inheritVar address3
+		inheritVar address4
+		inheritVar city
+		inheritVar state_province
+		inheritVar postal_code
+		inheritVar country
+		inheritVar phone1
+		inheritVar phone2
+		inheritVar birthdate
+		inheritVar marital_status
+		inheritVar yearly_income
+		inheritVar gender
+		inheritVar total_children
+		inheritVar num_children_at_home
+		inheritVar education
+		inheritVar date_accnt_opened
+		inheritVar member_card
+		inheritVar occupation
+		inheritVar houseowner
+		inheritVar num_cars_owned
+		inheritVar fullname
+		inheritVar test
+		inheritRef slips mapto CashSlipDto
+		inheritVar foo
 	}
 
 	autoDto CashRegisterDto extends BaseUUIDDto wraps CashRegister {
 
-		inherit var num
-		inherit var ip
-		inherit var location
-		inherit var currentDay
-		inherit ref slips mapto CashSlipDto
+		inheritVar num
+		inheritVar ip
+		inheritVar location
+		inheritVar currentDay
+		inheritRef slips mapto CashSlipDto
 	}
 
 	autoDto CashSlipDto extends BaseUUIDDto wraps CashSlip {
 
-		inherit var currentDay
-		inherit var now
-		inherit var cashier
-		inherit var total
-		inherit var serial
-		inherit var payed
-		inherit ref positions mapto CashPositionDto
-		inherit ref customer mapto McustomerDto
-		inherit ref register mapto CashRegisterDto
-		inherit ref payments mapto CashPaymentDto
+		inheritVar currentDay
+		inheritVar now
+		inheritVar cashier
+		inheritVar total
+		inheritVar serial
+		inheritVar payed
+		inheritRef positions mapto CashPositionDto
+		inheritRef customer mapto McustomerDto
+		inheritRef register mapto CashRegisterDto
+		inheritRef payments mapto CashPaymentDto
 	}
 
 	autoDto CashPositionDto extends BaseUUIDDto wraps CashPosition {
 
-		inherit var now
-		inherit var quantity
-		inherit var price
-		inherit var amount
-		inherit ref slip mapto CashSlipDto
+		inheritVar now
+		inheritVar quantity
+		inheritVar price
+		inheritVar amount
+		inheritRef slip mapto CashSlipDto
 	}
 
 	autoDto CashPaymentDto extends BaseUUIDDto wraps CashPayment {
 
-		inherit var now
-		inherit var payed
-		inherit ref slip mapto CashSlipDto
-		inherit ref methodOfPayment mapto CashPaymentMethodDto
+		inheritVar now
+		inheritVar payed
+		inheritRef slip mapto CashSlipDto
+		inheritRef methodOfPayment mapto CashPaymentMethodDto
 	}
 
 	autoDto CashPaymentMethodDto extends BaseUUIDDto wraps CashPaymentMethod {
 
-		inherit var num
-		inherit var name
-		inherit var credit
-		inherit var imageName
-		inherit var lowerLimit
-		inherit ref payments mapto CashPaymentDto
+		inheritVar num
+		inheritVar name
+		inheritVar credit
+		inheritVar imageName
+		inheritVar lowerLimit
+		inheritRef payments mapto CashPaymentDto
 	}
 
 	autoDto CompanyRelationTypeDto extends BaseUUIDDto wraps CompanyRelationType {
 
-		inherit var name
-		inherit var description
+		inheritVar name
+		inheritVar description
 	}
 
 	autoDto CompanyGroupDto extends BaseUUIDDto wraps CompanyGroup {
 
-		inherit var name
-		inherit var description
-		inherit ref main_company mapto CompanyDto
-		inherit ref companies mapto CompanyDto
+		inheritVar name
+		inheritVar description
+		inheritRef main_company mapto CompanyDto
+		inheritRef companies mapto CompanyDto
 	}
 
 	autoDto CompanyDto extends BaseUUIDDto wraps Company {
 
-		inherit ref company_group mapto CompanyGroupDto
-		inherit var name
-		inherit var description
-		inherit ref relation_type mapto CompanyRelationTypeDto
-		inherit ref address mapto AddressDto
-		inherit ref departments mapto DepartmentDto
+		inheritRef company_group mapto CompanyGroupDto
+		inheritVar name
+		inheritVar description
+		inheritRef relation_type mapto CompanyRelationTypeDto
+		inheritRef address mapto AddressDto
+		inheritRef departments mapto DepartmentDto
 	}
 
 	autoDto AddressDto extends BaseUUIDDto wraps Address {
 
-		inherit ref company mapto CompanyDto
-		inherit ref department mapto DepartmentDto
-		inherit var address1
-		inherit var address2
-		inherit var city
-		inherit var state_province
-		inherit var postal_code
-		inherit var country
-		inherit var email
-		inherit var landline
-		inherit var mobile
+		inheritRef company mapto CompanyDto
+		inheritRef department mapto DepartmentDto
+		inheritVar address1
+		inheritVar address2
+		inheritVar city
+		inheritVar state_province
+		inheritVar postal_code
+		inheritVar country
+		inheritVar email
+		inheritVar landline
+		inheritVar mobile
 	}
 
 	autoDto DepartmentDto extends BaseUUIDDto wraps Department {
 
-		inherit ref company mapto CompanyDto
-		inherit var name
-		inherit var description
-		inherit ref address mapto AddressDto
-		inherit var default_yearly_income
+		inheritRef company mapto CompanyDto
+		inheritVar name
+		inheritVar description
+		inheritRef address mapto AddressDto
+		inheritVar default_yearly_income
 	}
-
-	}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.runtime.tests/models/mysmartshop.entity b/org.eclipse.osbp.runtime.tests/models/mysmartshop.entity
index f197dc7..2457ac6 100644
--- a/org.eclipse.osbp.runtime.tests/models/mysmartshop.entity
+++ b/org.eclipse.osbp.runtime.tests/models/mysmartshop.entity
@@ -30,40 +30,43 @@
  ******************************************************************/
 package org.osbp.tests.entities {
 
-	mapped superclass BaseID {
-		id int id;
+	mappedSuperclass BaseID {
+		id int id
 	}
   
-	mapped superclass BaseUUID {
-		uuid String id;
+	mappedSuperclass BaseUUID {
+		uuid String id
 	}
 
 	entity DtoTestParent extends BaseUUID {
-
-		var String string;
+		persistenceUnit "businessdata"
+		var String string
 
 		ref cascade DtoTestChildContainment [*] containmentChilds opposite container
 
 		ref DtoTestChildCrossRef [*] crossRefChilds opposite container
 		ref DtoTestChildCrossRef crossRefChild
 
-		var DtoTestBean beanx;
+		var DtoTestBean beanx
 	}
 
 	entity DtoTestChildContainment extends BaseUUID {
+		persistenceUnit "businessdata"
 		ref DtoTestParent container opposite containmentChilds
 	}
 
 	entity DtoTestChildCrossRef extends BaseUUID {
+		persistenceUnit "businessdata"
 		ref DtoTestParent container opposite crossRefChilds
 	}
 
 	bean DtoTestBean {
-		var String foo;
-		ref DtoTestChildCrossRef crossRefChild;
+		var String foo
+		ref DtoTestChildCrossRef crossRefChild
 	}
  
 	entity Mcustomer extends BaseID {
+		persistenceUnit "businessdata"
 		var long account_num
 		var String lname
 		var String fname
@@ -100,6 +103,7 @@
 	}
 
 	cacheable entity CashRegister extends BaseUUID {
+		persistenceUnit "businessdata"
 		domainKey String num
 		var String ip
 		var String location
@@ -117,11 +121,12 @@
 	}
 
 	entity CashSlip extends BaseUUID {
+		persistenceUnit "businessdata"
 		var String currentDay
 		var Timestamp now
 		var String cashier
 		var Price total
-		@javax.persistence.GeneratedValue
+		@GeneratedValue
 		var long serial
 		var boolean payed
 		ref cascade CashPosition [*] positions opposite slip
@@ -131,7 +136,7 @@
 		def String when() {
 			if(now !== null)
 				{
-					return java.text.SimpleDateFormat.getDateInstance(java.text.DateFormat.SHORT).format(now)
+					return SimpleDateFormat.getDateInstance(DateFormat.SHORT).format(now)
 				} return ""
 			}
 
@@ -146,6 +151,7 @@
 		}
 
 		entity CashPosition extends BaseUUID {
+			persistenceUnit "businessdata"
 			var Timestamp now
 			var double quantity
 			var Price price
@@ -154,6 +160,7 @@
 		}
 
 		entity CashPayment extends BaseUUID {
+			persistenceUnit "businessdata"
 			var Timestamp now
 			var Price payed
 			ref CashSlip slip opposite payments
@@ -161,6 +168,7 @@
 		}
 
 		entity CashPaymentMethod extends BaseUUID {
+			persistenceUnit "businessdata"
 			domainKey String num
 			domainDescription String name
 			var Boolean credit
@@ -176,82 +184,87 @@
 
 		/** relation of the company to the owner - not the user - of this personal information manager */
 		entity CompanyRelationType extends BaseUUID {
+			persistenceUnit "businessdata"
 			/** short name for this relation type */
-			domainKey String name;
+			domainKey String name
 			/** more detailed description */
-			var String description;
+			var String description
 		}
 
 		/** a company group consisting of a group of companies, from one is defined as the main company */
 		entity CompanyGroup extends BaseUUID {
+			persistenceUnit "businessdata"
 			/** name of the company group */
-			domainKey String name;
+			domainKey String name
 			/** more detailed description with usable information for the PIM owner */
-			var String description;
+			var String description
 			/** the main company */
-			ref Company main_company;
+			ref Company main_company
 			/** group of companies */
-			ref Company [*] companies opposite company_group;
+			ref Company [*] companies opposite company_group
 		}
 
 		/** a company */
 		entity Company extends BaseUUID {
+			persistenceUnit "businessdata"
 			/** the company group if any */
-			ref CompanyGroup company_group opposite companies;
+			ref CompanyGroup company_group opposite companies
 			/** name of the company */
-			domainKey String name;
+			domainKey String name
 			/** more detailed description with usable information for the PIM owner */
-			var String description;
+			var String description
 			/** relation of the company to the PIM owner */
-			ref CompanyRelationType relation_type;
+			ref CompanyRelationType relation_type
 			/** any number of addresses */
-			ref cascade Address [*] address opposite company;
+			ref cascade Address [*] address opposite company
 			/** departments of this company */
-			ref cascade Department [*] departments opposite company;
+			ref cascade Department [*] departments opposite company
 		}
 
 		/** an address */
 		entity Address extends BaseUUID {
+			persistenceUnit "businessdata"
 			/** if address for a company, the company is given */
-			ref Company company opposite address;
+			ref Company company opposite address
 			/** if address for a department, the address is given */
-			ref Department department opposite address;
+			ref Department department opposite address
 			/** if address for a person, the person is given */
-			//        ref cascade PostalAddress[*] postal_adresses opposite address;
+			//        ref cascade PostalAddress[*] postal_adresses opposite address
 			/** address field 1 */
-			var String address1;
+			var String address1
 			/** address field 2 */
-			var String address2;
+			var String address2
 			/** city */
-			var String city;
+			var String city
 			/** state province */
-			var String state_province;
+			var String state_province
 			/** postal code */
-			var String postal_code;
+			var String postal_code
 			/** country */
-			var String country;
-			//        ref cascade Email[*] emails opposite address;
+			var String country
+			//        ref cascade Email[*] emails opposite address
 			/** email */
-			var String email;
-			//        ref cascade Phone[*] phones opposite address;
+			var String email
+			//        ref cascade Phone[*] phones opposite address
 			/** landline (Festnetznummer) */
-			var String landline;
+			var String landline
 			/** mobile */
-			var String mobile;
+			var String mobile
 		}
  
 		/** a companies department */
 		entity Department extends BaseUUID {
+			persistenceUnit "businessdata"
 			/** the company */
-			ref Company company opposite departments;
+			ref Company company opposite departments
 			/** name of the department */
-			domainKey String name;
+			domainKey String name
 			/** more detailed description with usable information for the PIM owner */
-			var String description;
+			var String description
 			/** any number of addresses */
-			ref cascade Address [*] address opposite department;
+			ref cascade Address [*] address opposite department
 			/** any number of employees */
-			var double default_yearly_income;
+			var double default_yearly_income
 		}
 
 	}
\ No newline at end of file
diff --git a/org.eclipse.osbp.runtime.tests/models/mysmartshop.service b/org.eclipse.osbp.runtime.tests/models/mysmartshop.service
index 8e97139..e9c8661 100644
--- a/org.eclipse.osbp.runtime.tests/models/mysmartshop.service
+++ b/org.eclipse.osbp.runtime.tests/models/mysmartshop.service
@@ -1,3 +1,4 @@
+
 import ns org.osbp.tests.dtos.BaseIDDto
 import ns org.osbp.tests.dtos.BaseUUIDDto
 import ns org.osbp.tests.dtos.DtoTestParentDto
@@ -15,20 +16,66 @@
 import ns org.osbp.tests.dtos.AddressDto
 import ns org.osbp.tests.dtos.DepartmentDto
 package org.osbp.tests.dtos.service {
+
 	dtoservice BaseIDDtoService provides BaseIDDto {
-	} dtoservice BaseUUIDDtoService provides BaseUUIDDto {
-	} dtoservice DtoTestParentDtoService provides DtoTestParentDto {
-	} dtoservice DtoTestChildContainmentDtoService provides DtoTestChildContainmentDto {
-	} dtoservice DtoTestChildCrossRefDtoService provides DtoTestChildCrossRefDto {
-	} dtoservice McustomerDtoService provides McustomerDto {
-	} dtoservice CashRegisterDtoService provides CashRegisterDto {
-	} dtoservice CashSlipDtoService provides CashSlipDto {
-	} dtoservice CashPositionDtoService provides CashPositionDto {
-	} dtoservice CashPaymentDtoService provides CashPaymentDto {
-	} dtoservice CashPaymentMethodDtoService provides CashPaymentMethodDto {
-	} dtoservice CompanyRelationTypeDtoService provides CompanyRelationTypeDto {
-	} dtoservice CompanyGroupDtoService provides CompanyGroupDto {
-	} dtoservice CompanyDtoService provides CompanyDto {
-	} dtoservice AddressDtoService provides AddressDto {
-	} dtoservice DepartmentDtoService provides DepartmentDto {
-	} }
\ No newline at end of file
+	}
+
+	dtoservice BaseUUIDDtoService provides BaseUUIDDto {
+	}
+
+	dtoservice DtoTestParentDtoService provides DtoTestParentDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice DtoTestChildContainmentDtoService provides DtoTestChildContainmentDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice DtoTestChildCrossRefDtoService provides DtoTestChildCrossRefDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice McustomerDtoService provides McustomerDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CashRegisterDtoService provides CashRegisterDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CashSlipDtoService provides CashSlipDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CashPositionDtoService provides CashPositionDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CashPaymentDtoService provides CashPaymentDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CashPaymentMethodDtoService provides CashPaymentMethodDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CompanyRelationTypeDtoService provides CompanyRelationTypeDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CompanyGroupDtoService provides CompanyGroupDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice CompanyDtoService provides CompanyDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice AddressDtoService provides AddressDto {
+		mutable persistenceUnit businessdata
+	}
+
+	dtoservice DepartmentDtoService provides DepartmentDto {
+		mutable persistenceUnit businessdata
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.runtime.tests/pom.xml b/org.eclipse.osbp.runtime.tests/pom.xml
index db127a4..f30f884 100644
--- a/org.eclipse.osbp.runtime.tests/pom.xml
+++ b/org.eclipse.osbp.runtime.tests/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: -->
 <!--# Florian Pirchner - initial API and implementation -->
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/AddressDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/AddressDto.java
index ec42bee..1ec8d9a 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/AddressDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/AddressDto.java
@@ -5,6 +5,7 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.CompanyDto;
 import org.osbp.tests.dtos.DepartmentDto;
@@ -12,9 +13,11 @@
 @SuppressWarnings("all")
 public class AddressDto extends BaseUUIDDto implements IDto, Serializable, PropertyChangeListener {
   @DomainReference
+  @FilterDepth(depth = 0)
   private CompanyDto company;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private DepartmentDto department;
   
   private String address1;
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseIDDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseIDDto.java
index 579d44c..a83d9ed 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseIDDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseIDDto.java
@@ -4,6 +4,7 @@
 import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.runtime.common.annotations.Dirty;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.Id;
 
@@ -14,6 +15,9 @@
   @Dispose
   private boolean disposed;
   
+  @Dirty
+  private transient boolean dirty;
+  
   @Id
   private int id;
   
@@ -75,6 +79,22 @@
   }
   
   /**
+   * @return true, if the object is dirty. 
+   * 
+   */
+  public boolean isDirty() {
+    return dirty;
+  }
+  
+  /**
+   * Sets the dirty state of this object.
+   * 
+   */
+  public void setDirty(final boolean dirty) {
+    firePropertyChange("dirty", this.dirty, this.dirty = dirty );
+  }
+  
+  /**
    * Checks whether the object is disposed.
    * @throws RuntimeException if the object is disposed.
    */
@@ -118,8 +138,7 @@
     				installLazyCollections();
   }
   
-  @Override
-  public boolean equals(final Object obj) {
+  public boolean equalVersions(final Object obj) {
     if (this == obj)
       return true;
     if (obj == null)
@@ -127,19 +146,11 @@
     if (getClass() != obj.getClass())
       return false;
     BaseIDDto other = (BaseIDDto) obj;
-    if (other.id != this.id)
+    if (this.id != other.id || (other.id == 0 && this.id == 0))
       return false;
     return true;
   }
   
-  @Override
-  public int hashCode() {
-     int prime = 31;
-    int result = 1;
-    result = prime * result + this.id;
-    return result;
-  }
-  
   public void propertyChange(final java.beans.PropertyChangeEvent event) {
     Object source = event.getSource();
     
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseUUIDDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseUUIDDto.java
index 6375c28..63df43d 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseUUIDDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/BaseUUIDDto.java
@@ -4,6 +4,7 @@
 import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.runtime.common.annotations.Dirty;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.Id;
 
@@ -14,6 +15,9 @@
   @Dispose
   private boolean disposed;
   
+  @Dirty
+  private transient boolean dirty;
+  
   @Id
   private String id = java.util.UUID.randomUUID().toString();
   
@@ -75,6 +79,22 @@
   }
   
   /**
+   * @return true, if the object is dirty. 
+   * 
+   */
+  public boolean isDirty() {
+    return dirty;
+  }
+  
+  /**
+   * Sets the dirty state of this object.
+   * 
+   */
+  public void setDirty(final boolean dirty) {
+    firePropertyChange("dirty", this.dirty, this.dirty = dirty );
+  }
+  
+  /**
    * Checks whether the object is disposed.
    * @throws RuntimeException if the object is disposed.
    */
@@ -118,8 +138,7 @@
     				installLazyCollections();
   }
   
-  @Override
-  public boolean equals(final Object obj) {
+  public boolean equalVersions(final Object obj) {
     if (this == obj)
       return true;
     if (obj == null)
@@ -135,14 +154,6 @@
     return true;
   }
   
-  @Override
-  public int hashCode() {
-     int prime = 31;
-    int result = 1;
-    result = prime * result + ((this.id== null) ? 0 : this.id.hashCode());
-    return result;
-  }
-  
   public void propertyChange(final java.beans.PropertyChangeEvent event) {
     Object source = event.getSource();
     
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentDto.java
index 2034c58..b504167 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentDto.java
@@ -7,6 +7,7 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.eclipse.osbp.runtime.common.annotations.Properties;
 import org.eclipse.osbp.runtime.common.annotations.Property;
 import org.osbp.tests.dtos.BaseUUIDDto;
@@ -18,13 +19,15 @@
   @Valid
   private Date now;
   
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double payed;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private CashSlipDto slip;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private CashPaymentMethodDto methodOfPayment;
   
   public CashPaymentDto() {
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentMethodDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentMethodDto.java
index 6cc6158..9e926ae 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentMethodDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPaymentMethodDto.java
@@ -9,6 +9,7 @@
 import org.eclipse.osbp.runtime.common.annotations.DomainDescription;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.CashPaymentDto;
 
@@ -27,6 +28,7 @@
   private double lowerLimit;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private List<CashPaymentDto> payments;
   
   public CashPaymentMethodDto() {
@@ -42,7 +44,7 @@
     payments = new org.eclipse.osbp.dsl.dto.lib.OppositeDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
     				CashPaymentDto.class, "methodOfPayment.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -213,16 +215,15 @@
    */
   public void internalAddToPayments(final CashPaymentDto cashPaymentDto) {
     
-    if(!internalGetPayments().contains(cashPaymentDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<CashPaymentDto> oldList = new java.util.ArrayList<>(internalGetPayments());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<CashPaymentDto> oldList = null;
+    		if(internalGetPayments() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetPayments()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetPayments());
+    		}
     		internalGetPayments().add(cashPaymentDto);
     		firePropertyChange("payments", oldList, internalGetPayments());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetPayments().add(cashPaymentDto);
-    	}
     }
   }
   
@@ -231,8 +232,12 @@
    */
   public void internalRemoveFromPayments(final CashPaymentDto cashPaymentDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<CashPaymentDto> oldList = new java.util.ArrayList<>(internalGetPayments());
+    	List<CashPaymentDto> oldList = null;
+    	if(internalGetPayments() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetPayments()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetPayments());
+    	}
     	internalGetPayments().remove(cashPaymentDto);
     	firePropertyChange("payments", oldList, internalGetPayments());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPositionDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPositionDto.java
index 3ff1e17..e92ac91 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPositionDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashPositionDto.java
@@ -7,6 +7,7 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.eclipse.osbp.runtime.common.annotations.Properties;
 import org.eclipse.osbp.runtime.common.annotations.Property;
 import org.osbp.tests.dtos.BaseUUIDDto;
@@ -19,13 +20,14 @@
   
   private double quantity;
   
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double price;
   
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double amount;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private CashSlipDto slip;
   
   public CashPositionDto() {
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashRegisterDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashRegisterDto.java
index 121c83a..08b8c53 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashRegisterDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashRegisterDto.java
@@ -8,6 +8,7 @@
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.CashSlipDto;
 
@@ -23,6 +24,7 @@
   private String currentDay;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private List<CashSlipDto> slips;
   
   public CashRegisterDto() {
@@ -38,7 +40,7 @@
     slips = new org.eclipse.osbp.dsl.dto.lib.OppositeDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
     				CashSlipDto.class, "register.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -191,16 +193,15 @@
    */
   public void internalAddToSlips(final CashSlipDto cashSlipDto) {
     
-    if(!internalGetSlips().contains(cashSlipDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<CashSlipDto> oldList = new java.util.ArrayList<>(internalGetSlips());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<CashSlipDto> oldList = null;
+    		if(internalGetSlips() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetSlips()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetSlips());
+    		}
     		internalGetSlips().add(cashSlipDto);
     		firePropertyChange("slips", oldList, internalGetSlips());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetSlips().add(cashSlipDto);
-    	}
     }
   }
   
@@ -209,8 +210,12 @@
    */
   public void internalRemoveFromSlips(final CashSlipDto cashSlipDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<CashSlipDto> oldList = new java.util.ArrayList<>(internalGetSlips());
+    	List<CashSlipDto> oldList = null;
+    	if(internalGetSlips() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetSlips()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetSlips());
+    	}
     	internalGetSlips().remove(cashSlipDto);
     	firePropertyChange("slips", oldList, internalGetSlips());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashSlipDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashSlipDto.java
index 90c5911..9b9e05c 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashSlipDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CashSlipDto.java
@@ -9,6 +9,7 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.eclipse.osbp.runtime.common.annotations.Properties;
 import org.eclipse.osbp.runtime.common.annotations.Property;
 import org.osbp.tests.dtos.BaseUUIDDto;
@@ -26,7 +27,7 @@
   
   private String cashier;
   
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double total;
   
   private long serial;
@@ -35,16 +36,20 @@
   
   @DomainReference
   @Valid
+  @FilterDepth(depth = 0)
   private List<CashPositionDto> positions;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private McustomerDto customer;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private CashRegisterDto register;
   
   @DomainReference
   @Valid
+  @FilterDepth(depth = 0)
   private List<CashPaymentDto> payments;
   
   public CashSlipDto() {
@@ -59,12 +64,12 @@
     super.installLazyCollections();
     positions = new org.eclipse.osbp.dsl.dto.lib.OppositeContainmentDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
-    				CashPositionDto.class, "slip.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				CashPositionDto.class, this, "slip.id",
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
     payments = new org.eclipse.osbp.dsl.dto.lib.OppositeContainmentDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
-    				CashPaymentDto.class, "slip.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				CashPaymentDto.class, this, "slip.id",
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -272,16 +277,15 @@
    */
   public void internalAddToPositions(final CashPositionDto cashPositionDto) {
     
-    if(!internalGetPositions().contains(cashPositionDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<CashPositionDto> oldList = new java.util.ArrayList<>(internalGetPositions());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<CashPositionDto> oldList = null;
+    		if(internalGetPositions() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetPositions()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetPositions());
+    		}
     		internalGetPositions().add(cashPositionDto);
     		firePropertyChange("positions", oldList, internalGetPositions());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetPositions().add(cashPositionDto);
-    	}
     }
   }
   
@@ -290,8 +294,12 @@
    */
   public void internalRemoveFromPositions(final CashPositionDto cashPositionDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<CashPositionDto> oldList = new java.util.ArrayList<>(internalGetPositions());
+    	List<CashPositionDto> oldList = null;
+    	if(internalGetPositions() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetPositions()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetPositions());
+    	}
     	internalGetPositions().remove(cashPositionDto);
     	firePropertyChange("positions", oldList, internalGetPositions());	
     }else{
@@ -455,16 +463,15 @@
    */
   public void internalAddToPayments(final CashPaymentDto cashPaymentDto) {
     
-    if(!internalGetPayments().contains(cashPaymentDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<CashPaymentDto> oldList = new java.util.ArrayList<>(internalGetPayments());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<CashPaymentDto> oldList = null;
+    		if(internalGetPayments() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetPayments()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetPayments());
+    		}
     		internalGetPayments().add(cashPaymentDto);
     		firePropertyChange("payments", oldList, internalGetPayments());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetPayments().add(cashPaymentDto);
-    	}
     }
   }
   
@@ -473,8 +480,12 @@
    */
   public void internalRemoveFromPayments(final CashPaymentDto cashPaymentDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<CashPaymentDto> oldList = new java.util.ArrayList<>(internalGetPayments());
+    	List<CashPaymentDto> oldList = null;
+    	if(internalGetPayments() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetPayments()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetPayments());
+    	}
     	internalGetPayments().remove(cashPaymentDto);
     	firePropertyChange("payments", oldList, internalGetPayments());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyDto.java
index 6ab9c97..6d3df94 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyDto.java
@@ -9,6 +9,7 @@
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.AddressDto;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.CompanyGroupDto;
@@ -18,6 +19,7 @@
 @SuppressWarnings("all")
 public class CompanyDto extends BaseUUIDDto implements IDto, Serializable, PropertyChangeListener {
   @DomainReference
+  @FilterDepth(depth = 0)
   private CompanyGroupDto company_group;
   
   @DomainKey
@@ -26,14 +28,17 @@
   private String description;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private CompanyRelationTypeDto relation_type;
   
   @DomainReference
   @Valid
+  @FilterDepth(depth = 0)
   private List<AddressDto> address;
   
   @DomainReference
   @Valid
+  @FilterDepth(depth = 0)
   private List<DepartmentDto> departments;
   
   public CompanyDto() {
@@ -48,12 +53,12 @@
     super.installLazyCollections();
     address = new org.eclipse.osbp.dsl.dto.lib.OppositeContainmentDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
-    				AddressDto.class, "company.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				AddressDto.class, this, "company.id",
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
     departments = new org.eclipse.osbp.dsl.dto.lib.OppositeContainmentDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
-    				DepartmentDto.class, "company.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				DepartmentDto.class, this, "company.id",
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -246,16 +251,15 @@
    */
   public void internalAddToAddress(final AddressDto addressDto) {
     
-    if(!internalGetAddress().contains(addressDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<AddressDto> oldList = new java.util.ArrayList<>(internalGetAddress());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<AddressDto> oldList = null;
+    		if(internalGetAddress() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetAddress()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetAddress());
+    		}
     		internalGetAddress().add(addressDto);
     		firePropertyChange("address", oldList, internalGetAddress());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetAddress().add(addressDto);
-    	}
     }
   }
   
@@ -264,8 +268,12 @@
    */
   public void internalRemoveFromAddress(final AddressDto addressDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<AddressDto> oldList = new java.util.ArrayList<>(internalGetAddress());
+    	List<AddressDto> oldList = null;
+    	if(internalGetAddress() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetAddress()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetAddress());
+    	}
     	internalGetAddress().remove(addressDto);
     	firePropertyChange("address", oldList, internalGetAddress());	
     }else{
@@ -353,16 +361,15 @@
    */
   public void internalAddToDepartments(final DepartmentDto departmentDto) {
     
-    if(!internalGetDepartments().contains(departmentDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<DepartmentDto> oldList = new java.util.ArrayList<>(internalGetDepartments());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<DepartmentDto> oldList = null;
+    		if(internalGetDepartments() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetDepartments()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetDepartments());
+    		}
     		internalGetDepartments().add(departmentDto);
     		firePropertyChange("departments", oldList, internalGetDepartments());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetDepartments().add(departmentDto);
-    	}
     }
   }
   
@@ -371,8 +378,12 @@
    */
   public void internalRemoveFromDepartments(final DepartmentDto departmentDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<DepartmentDto> oldList = new java.util.ArrayList<>(internalGetDepartments());
+    	List<DepartmentDto> oldList = null;
+    	if(internalGetDepartments() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetDepartments()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetDepartments());
+    	}
     	internalGetDepartments().remove(departmentDto);
     	firePropertyChange("departments", oldList, internalGetDepartments());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyGroupDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyGroupDto.java
index a126cc1..0e89e76 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyGroupDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/CompanyGroupDto.java
@@ -8,6 +8,7 @@
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.CompanyDto;
 
@@ -19,9 +20,11 @@
   private String description;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private CompanyDto main_company;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private List<CompanyDto> companies;
   
   public CompanyGroupDto() {
@@ -37,7 +40,7 @@
     companies = new org.eclipse.osbp.dsl.dto.lib.OppositeDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
     				CompanyDto.class, "company_group.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -173,16 +176,15 @@
    */
   public void internalAddToCompanies(final CompanyDto companyDto) {
     
-    if(!internalGetCompanies().contains(companyDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<CompanyDto> oldList = new java.util.ArrayList<>(internalGetCompanies());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<CompanyDto> oldList = null;
+    		if(internalGetCompanies() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetCompanies()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetCompanies());
+    		}
     		internalGetCompanies().add(companyDto);
     		firePropertyChange("companies", oldList, internalGetCompanies());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetCompanies().add(companyDto);
-    	}
     }
   }
   
@@ -191,8 +193,12 @@
    */
   public void internalRemoveFromCompanies(final CompanyDto companyDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<CompanyDto> oldList = new java.util.ArrayList<>(internalGetCompanies());
+    	List<CompanyDto> oldList = null;
+    	if(internalGetCompanies() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetCompanies()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetCompanies());
+    	}
     	internalGetCompanies().remove(companyDto);
     	firePropertyChange("companies", oldList, internalGetCompanies());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DepartmentDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DepartmentDto.java
index b398612..ab68888 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DepartmentDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DepartmentDto.java
@@ -9,6 +9,7 @@
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.AddressDto;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.CompanyDto;
@@ -16,6 +17,7 @@
 @SuppressWarnings("all")
 public class DepartmentDto extends BaseUUIDDto implements IDto, Serializable, PropertyChangeListener {
   @DomainReference
+  @FilterDepth(depth = 0)
   private CompanyDto company;
   
   @DomainKey
@@ -25,6 +27,7 @@
   
   @DomainReference
   @Valid
+  @FilterDepth(depth = 0)
   private List<AddressDto> address;
   
   private double default_yearly_income;
@@ -41,8 +44,8 @@
     super.installLazyCollections();
     address = new org.eclipse.osbp.dsl.dto.lib.OppositeContainmentDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
-    				AddressDto.class, "department.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				AddressDto.class, this, "department.id",
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -210,16 +213,15 @@
    */
   public void internalAddToAddress(final AddressDto addressDto) {
     
-    if(!internalGetAddress().contains(addressDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<AddressDto> oldList = new java.util.ArrayList<>(internalGetAddress());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<AddressDto> oldList = null;
+    		if(internalGetAddress() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetAddress()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetAddress());
+    		}
     		internalGetAddress().add(addressDto);
     		firePropertyChange("address", oldList, internalGetAddress());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetAddress().add(addressDto);
-    	}
     }
   }
   
@@ -228,8 +230,12 @@
    */
   public void internalRemoveFromAddress(final AddressDto addressDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<AddressDto> oldList = new java.util.ArrayList<>(internalGetAddress());
+    	List<AddressDto> oldList = null;
+    	if(internalGetAddress() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetAddress()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetAddress());
+    	}
     	internalGetAddress().remove(addressDto);
     	firePropertyChange("address", oldList, internalGetAddress());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestBeanDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestBeanDto.java
index bc54ee4..8cf9683 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestBeanDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestBeanDto.java
@@ -4,6 +4,7 @@
 import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.runtime.common.annotations.Dirty;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
 import org.osbp.tests.dtos.DtoTestChildCrossRefDto;
@@ -15,6 +16,9 @@
   @Dispose
   private boolean disposed;
   
+  @Dirty
+  private transient boolean dirty;
+  
   private String foo;
   
   @DomainReference
@@ -78,6 +82,22 @@
   }
   
   /**
+   * @return true, if the object is dirty. 
+   * 
+   */
+  public boolean isDirty() {
+    return dirty;
+  }
+  
+  /**
+   * Sets the dirty state of this object.
+   * 
+   */
+  public void setDirty(final boolean dirty) {
+    firePropertyChange("dirty", this.dirty, this.dirty = dirty );
+  }
+  
+  /**
    * Checks whether the object is disposed.
    * @throws RuntimeException if the object is disposed.
    */
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildContainmentDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildContainmentDto.java
index 255f3aa..2390ca4 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildContainmentDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildContainmentDto.java
@@ -5,12 +5,14 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.DtoTestParentDto;
 
 @SuppressWarnings("all")
 public class DtoTestChildContainmentDto extends BaseUUIDDto implements IDto, Serializable, PropertyChangeListener {
   @DomainReference
+  @FilterDepth(depth = 0)
   private DtoTestParentDto container;
   
   public DtoTestChildContainmentDto() {
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildCrossRefDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildCrossRefDto.java
index fb3f583..ad6252f 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildCrossRefDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestChildCrossRefDto.java
@@ -5,12 +5,14 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.DtoTestParentDto;
 
 @SuppressWarnings("all")
 public class DtoTestChildCrossRefDto extends BaseUUIDDto implements IDto, Serializable, PropertyChangeListener {
   @DomainReference
+  @FilterDepth(depth = 0)
   private DtoTestParentDto container;
   
   public DtoTestChildCrossRefDto() {
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestParentDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestParentDto.java
index 92773e2..211e538 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestParentDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/DtoTestParentDto.java
@@ -8,6 +8,7 @@
 import org.eclipse.osbp.dsl.common.datatypes.IDto;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseUUIDDto;
 import org.osbp.tests.dtos.DtoTestBeanDto;
 import org.osbp.tests.dtos.DtoTestChildContainmentDto;
@@ -19,12 +20,15 @@
   
   @DomainReference
   @Valid
+  @FilterDepth(depth = 0)
   private List<DtoTestChildContainmentDto> containmentChilds;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private List<DtoTestChildCrossRefDto> crossRefChilds;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private DtoTestChildCrossRefDto crossRefChild;
   
   @Valid
@@ -42,12 +46,12 @@
     super.installLazyCollections();
     containmentChilds = new org.eclipse.osbp.dsl.dto.lib.OppositeContainmentDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
-    				DtoTestChildContainmentDto.class, "container.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				DtoTestChildContainmentDto.class, this, "container.id",
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
     crossRefChilds = new org.eclipse.osbp.dsl.dto.lib.OppositeDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
     				DtoTestChildCrossRefDto.class, "container.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -159,16 +163,15 @@
    */
   public void internalAddToContainmentChilds(final DtoTestChildContainmentDto dtoTestChildContainmentDto) {
     
-    if(!internalGetContainmentChilds().contains(dtoTestChildContainmentDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<DtoTestChildContainmentDto> oldList = new java.util.ArrayList<>(internalGetContainmentChilds());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<DtoTestChildContainmentDto> oldList = null;
+    		if(internalGetContainmentChilds() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetContainmentChilds()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetContainmentChilds());
+    		}
     		internalGetContainmentChilds().add(dtoTestChildContainmentDto);
     		firePropertyChange("containmentChilds", oldList, internalGetContainmentChilds());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetContainmentChilds().add(dtoTestChildContainmentDto);
-    	}
     }
   }
   
@@ -177,8 +180,12 @@
    */
   public void internalRemoveFromContainmentChilds(final DtoTestChildContainmentDto dtoTestChildContainmentDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<DtoTestChildContainmentDto> oldList = new java.util.ArrayList<>(internalGetContainmentChilds());
+    	List<DtoTestChildContainmentDto> oldList = null;
+    	if(internalGetContainmentChilds() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetContainmentChilds()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetContainmentChilds());
+    	}
     	internalGetContainmentChilds().remove(dtoTestChildContainmentDto);
     	firePropertyChange("containmentChilds", oldList, internalGetContainmentChilds());	
     }else{
@@ -266,16 +273,15 @@
    */
   public void internalAddToCrossRefChilds(final DtoTestChildCrossRefDto dtoTestChildCrossRefDto) {
     
-    if(!internalGetCrossRefChilds().contains(dtoTestChildCrossRefDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<DtoTestChildCrossRefDto> oldList = new java.util.ArrayList<>(internalGetCrossRefChilds());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<DtoTestChildCrossRefDto> oldList = null;
+    		if(internalGetCrossRefChilds() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetCrossRefChilds()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetCrossRefChilds());
+    		}
     		internalGetCrossRefChilds().add(dtoTestChildCrossRefDto);
     		firePropertyChange("crossRefChilds", oldList, internalGetCrossRefChilds());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetCrossRefChilds().add(dtoTestChildCrossRefDto);
-    	}
     }
   }
   
@@ -284,8 +290,12 @@
    */
   public void internalRemoveFromCrossRefChilds(final DtoTestChildCrossRefDto dtoTestChildCrossRefDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<DtoTestChildCrossRefDto> oldList = new java.util.ArrayList<>(internalGetCrossRefChilds());
+    	List<DtoTestChildCrossRefDto> oldList = null;
+    	if(internalGetCrossRefChilds() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetCrossRefChilds()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetCrossRefChilds());
+    	}
     	internalGetCrossRefChilds().remove(dtoTestChildCrossRefDto);
     	firePropertyChange("crossRefChilds", oldList, internalGetCrossRefChilds());	
     }else{
@@ -375,9 +385,11 @@
     
     // forward the event from embeddable beans to all listeners. So the parent of the embeddable
     // bean will become notified and its dirty state can be handled properly
-    if(source == beanx){
-    	firePropertyChange("beanx" + "_" + event.getPropertyName(), event.getOldValue(), event.getNewValue());
-    } else 
+    
+    
+    	if(source == beanx){
+    		firePropertyChange("beanx" + "_" + event.getPropertyName(), event.getOldValue(), event.getNewValue());
+    	} else 
     { 
     	super.propertyChange(event);
     }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/McustomerDto.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/McustomerDto.java
index 8ed33a0..9253d47 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/McustomerDto.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/McustomerDto.java
@@ -10,6 +10,7 @@
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
 import org.eclipse.osbp.runtime.common.annotations.DomainReference;
+import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.osbp.tests.dtos.BaseIDDto;
 import org.osbp.tests.dtos.CashSlipDto;
 
@@ -74,6 +75,7 @@
   private String test;
   
   @DomainReference
+  @FilterDepth(depth = 0)
   private List<CashSlipDto> slips;
   
   private String foo;
@@ -91,7 +93,7 @@
     slips = new org.eclipse.osbp.dsl.dto.lib.OppositeDtoList<>(
     				org.eclipse.osbp.dsl.dto.lib.MappingContext.getCurrent(),
     				CashSlipDto.class, "customer.id",
-    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId());
+    				(java.util.function.Supplier<Object> & Serializable) () -> this.getId(), this);
   }
   
   /**
@@ -676,16 +678,15 @@
    */
   public void internalAddToSlips(final CashSlipDto cashSlipDto) {
     
-    if(!internalGetSlips().contains(cashSlipDto)) {
-    	if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    		// collections will become resolved! We need to send a delta notification.
-    		List<CashSlipDto> oldList = new java.util.ArrayList<>(internalGetSlips());
+    if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
+    		List<CashSlipDto> oldList = null;
+    		if(internalGetSlips() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    			oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetSlips()).copy();
+    		} else {
+    			oldList = new java.util.ArrayList<>(internalGetSlips());
+    		}
     		internalGetSlips().add(cashSlipDto);
     		firePropertyChange("slips", oldList, internalGetSlips());
-    	} else {
-    		// in mapping mode, we do NOT resolve any collection
-    		internalGetSlips().add(cashSlipDto);
-    	}
     }
   }
   
@@ -694,8 +695,12 @@
    */
   public void internalRemoveFromSlips(final CashSlipDto cashSlipDto) {
     if(!org.eclipse.osbp.dsl.dto.lib.MappingContext.isMappingMode()) {
-    	// collections will become resolved! We need to send a delta notification.
-    	List<CashSlipDto> oldList = new java.util.ArrayList<>(internalGetSlips());
+    	List<CashSlipDto> oldList = null;
+    	if(internalGetSlips() instanceof org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) {
+    		oldList = ((org.eclipse.osbp.dsl.dto.lib.AbstractOppositeDtoList) internalGetSlips()).copy();
+    	} else {
+    		oldList = new java.util.ArrayList<>(internalGetSlips());
+    	}
     	internalGetSlips().remove(cashSlipDto);
     	firePropertyChange("slips", oldList, internalGetSlips());	
     }else{
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/AddressDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/AddressDtoService.java
index ef881fd..e7210b3 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/AddressDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/AddressDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.AddressDto;
 import org.osbp.tests.entities.Address;
 
 @SuppressWarnings("all")
-public class AddressDtoService extends AbstractDTOService<AddressDto, Address> {
+public class AddressDtoService extends AbstractDTOServiceWithMutablePersistence<AddressDto, Address> {
+  public AddressDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<AddressDto> getDtoClass() {
     return AddressDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentDtoService.java
index 63fd282..adc9495 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CashPaymentDto;
 import org.osbp.tests.entities.CashPayment;
 
 @SuppressWarnings("all")
-public class CashPaymentDtoService extends AbstractDTOService<CashPaymentDto, CashPayment> {
+public class CashPaymentDtoService extends AbstractDTOServiceWithMutablePersistence<CashPaymentDto, CashPayment> {
+  public CashPaymentDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CashPaymentDto> getDtoClass() {
     return CashPaymentDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentMethodDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentMethodDtoService.java
index a37ddd7..3b92091 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentMethodDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPaymentMethodDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CashPaymentMethodDto;
 import org.osbp.tests.entities.CashPaymentMethod;
 
 @SuppressWarnings("all")
-public class CashPaymentMethodDtoService extends AbstractDTOService<CashPaymentMethodDto, CashPaymentMethod> {
+public class CashPaymentMethodDtoService extends AbstractDTOServiceWithMutablePersistence<CashPaymentMethodDto, CashPaymentMethod> {
+  public CashPaymentMethodDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CashPaymentMethodDto> getDtoClass() {
     return CashPaymentMethodDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPositionDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPositionDtoService.java
index a584227..5823dac 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPositionDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashPositionDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CashPositionDto;
 import org.osbp.tests.entities.CashPosition;
 
 @SuppressWarnings("all")
-public class CashPositionDtoService extends AbstractDTOService<CashPositionDto, CashPosition> {
+public class CashPositionDtoService extends AbstractDTOServiceWithMutablePersistence<CashPositionDto, CashPosition> {
+  public CashPositionDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CashPositionDto> getDtoClass() {
     return CashPositionDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashRegisterDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashRegisterDtoService.java
index abe076a..4c1190c 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashRegisterDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashRegisterDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CashRegisterDto;
 import org.osbp.tests.entities.CashRegister;
 
 @SuppressWarnings("all")
-public class CashRegisterDtoService extends AbstractDTOService<CashRegisterDto, CashRegister> {
+public class CashRegisterDtoService extends AbstractDTOServiceWithMutablePersistence<CashRegisterDto, CashRegister> {
+  public CashRegisterDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CashRegisterDto> getDtoClass() {
     return CashRegisterDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashSlipDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashSlipDtoService.java
index 342019a..7c4be31 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashSlipDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CashSlipDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CashSlipDto;
 import org.osbp.tests.entities.CashSlip;
 
 @SuppressWarnings("all")
-public class CashSlipDtoService extends AbstractDTOService<CashSlipDto, CashSlip> {
+public class CashSlipDtoService extends AbstractDTOServiceWithMutablePersistence<CashSlipDto, CashSlip> {
+  public CashSlipDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CashSlipDto> getDtoClass() {
     return CashSlipDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyDtoService.java
index c117891..18adac8 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CompanyDto;
 import org.osbp.tests.entities.Company;
 
 @SuppressWarnings("all")
-public class CompanyDtoService extends AbstractDTOService<CompanyDto, Company> {
+public class CompanyDtoService extends AbstractDTOServiceWithMutablePersistence<CompanyDto, Company> {
+  public CompanyDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CompanyDto> getDtoClass() {
     return CompanyDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyGroupDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyGroupDtoService.java
index a290320..b55609c 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyGroupDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyGroupDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CompanyGroupDto;
 import org.osbp.tests.entities.CompanyGroup;
 
 @SuppressWarnings("all")
-public class CompanyGroupDtoService extends AbstractDTOService<CompanyGroupDto, CompanyGroup> {
+public class CompanyGroupDtoService extends AbstractDTOServiceWithMutablePersistence<CompanyGroupDto, CompanyGroup> {
+  public CompanyGroupDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CompanyGroupDto> getDtoClass() {
     return CompanyGroupDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyRelationTypeDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyRelationTypeDtoService.java
index 546e361..925fa35 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyRelationTypeDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/CompanyRelationTypeDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.CompanyRelationTypeDto;
 import org.osbp.tests.entities.CompanyRelationType;
 
 @SuppressWarnings("all")
-public class CompanyRelationTypeDtoService extends AbstractDTOService<CompanyRelationTypeDto, CompanyRelationType> {
+public class CompanyRelationTypeDtoService extends AbstractDTOServiceWithMutablePersistence<CompanyRelationTypeDto, CompanyRelationType> {
+  public CompanyRelationTypeDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<CompanyRelationTypeDto> getDtoClass() {
     return CompanyRelationTypeDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DepartmentDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DepartmentDtoService.java
index 7d872ab..057ee60 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DepartmentDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DepartmentDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.DepartmentDto;
 import org.osbp.tests.entities.Department;
 
 @SuppressWarnings("all")
-public class DepartmentDtoService extends AbstractDTOService<DepartmentDto, Department> {
+public class DepartmentDtoService extends AbstractDTOServiceWithMutablePersistence<DepartmentDto, Department> {
+  public DepartmentDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<DepartmentDto> getDtoClass() {
     return DepartmentDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildContainmentDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildContainmentDtoService.java
index f9bef74..247b242 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildContainmentDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildContainmentDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.DtoTestChildContainmentDto;
 import org.osbp.tests.entities.DtoTestChildContainment;
 
 @SuppressWarnings("all")
-public class DtoTestChildContainmentDtoService extends AbstractDTOService<DtoTestChildContainmentDto, DtoTestChildContainment> {
+public class DtoTestChildContainmentDtoService extends AbstractDTOServiceWithMutablePersistence<DtoTestChildContainmentDto, DtoTestChildContainment> {
+  public DtoTestChildContainmentDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<DtoTestChildContainmentDto> getDtoClass() {
     return DtoTestChildContainmentDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildCrossRefDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildCrossRefDtoService.java
index f711016..deaaa95 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildCrossRefDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestChildCrossRefDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.DtoTestChildCrossRefDto;
 import org.osbp.tests.entities.DtoTestChildCrossRef;
 
 @SuppressWarnings("all")
-public class DtoTestChildCrossRefDtoService extends AbstractDTOService<DtoTestChildCrossRefDto, DtoTestChildCrossRef> {
+public class DtoTestChildCrossRefDtoService extends AbstractDTOServiceWithMutablePersistence<DtoTestChildCrossRefDto, DtoTestChildCrossRef> {
+  public DtoTestChildCrossRefDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<DtoTestChildCrossRefDto> getDtoClass() {
     return DtoTestChildCrossRefDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestParentDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestParentDtoService.java
index 52cf5ff..2d13019 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestParentDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/DtoTestParentDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.DtoTestParentDto;
 import org.osbp.tests.entities.DtoTestParent;
 
 @SuppressWarnings("all")
-public class DtoTestParentDtoService extends AbstractDTOService<DtoTestParentDto, DtoTestParent> {
+public class DtoTestParentDtoService extends AbstractDTOServiceWithMutablePersistence<DtoTestParentDto, DtoTestParent> {
+  public DtoTestParentDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<DtoTestParentDto> getDtoClass() {
     return DtoTestParentDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/McustomerDtoService.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/McustomerDtoService.java
index 60426ac..f0801b1 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/McustomerDtoService.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/dtos/service/McustomerDtoService.java
@@ -1,11 +1,16 @@
 package org.osbp.tests.dtos.service;
 
-import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
+import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOServiceWithMutablePersistence;
 import org.osbp.tests.dtos.McustomerDto;
 import org.osbp.tests.entities.Mcustomer;
 
 @SuppressWarnings("all")
-public class McustomerDtoService extends AbstractDTOService<McustomerDto, Mcustomer> {
+public class McustomerDtoService extends AbstractDTOServiceWithMutablePersistence<McustomerDto, Mcustomer> {
+  public McustomerDtoService() {
+    // set the default persistence ID
+    setPersistenceId("businessdata");
+  }
+  
   public Class<McustomerDto> getDtoClass() {
     return McustomerDto.class;
   }
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Address.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Address.java
index d9dd69b..818168b 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Address.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Address.java
@@ -14,10 +14,8 @@
  */
 package org.osbp.tests.entities;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PreRemove;
@@ -38,14 +36,14 @@
   /**
    * if address for a company, the company is given
    */
-  @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+  @ManyToOne
   @JoinColumn(name = "COMPANY_ID")
   private Company company;
   
   /**
    * if address for a department, the address is given
    */
-  @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+  @ManyToOne
   @JoinColumn(name = "DEPARTMENT_ID")
   private Department department;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseID.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseID.java
index f989dc8..f4ad41d 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseID.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseID.java
@@ -14,15 +14,18 @@
  */
 package org.osbp.tests.entities;
 
+import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.PreRemove;
 import javax.persistence.Transient;
 import org.eclipse.osbp.dsl.common.datatypes.IEntity;
+import org.eclipse.osbp.jpa.services.listener.EntityInfoListener;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 
 @MappedSuperclass
+@EntityListeners(value = EntityInfoListener.class)
 @SuppressWarnings("all")
 public class BaseID implements IEntity {
   @Transient
@@ -85,8 +88,7 @@
     this.id = id;
   }
   
-  @Override
-  public boolean equals(final Object obj) {
+  public boolean equalVersions(final Object obj) {
     if (this == obj)
       return true;
     if (obj == null)
@@ -94,12 +96,17 @@
     if (getClass() != obj.getClass())
       return false;
     BaseID other = (BaseID) obj;
-    if (other.id != this.id)
+    if (this.id != other.id || (other.id == 0 && this.id == 0))
       return false;
     return true;
   }
   
   @Override
+  public boolean equals(final Object obj) {
+    return equalVersions(obj);
+  }
+  
+  @Override
   public int hashCode() {
      int prime = 31;
     int result = 1;
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseUUID.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseUUID.java
index ecd0d3a..bf6d6f4 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseUUID.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/BaseUUID.java
@@ -14,14 +14,17 @@
  */
 package org.osbp.tests.entities;
 
+import javax.persistence.EntityListeners;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.PreRemove;
 import javax.persistence.Transient;
 import org.eclipse.osbp.dsl.common.datatypes.IEntity;
+import org.eclipse.osbp.jpa.services.listener.EntityInfoListener;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 
 @MappedSuperclass
+@EntityListeners(value = EntityInfoListener.class)
 @SuppressWarnings("all")
 public class BaseUUID implements IEntity {
   @Transient
@@ -83,8 +86,7 @@
     this.id = id;
   }
   
-  @Override
-  public boolean equals(final Object obj) {
+  public boolean equalVersions(final Object obj) {
     if (this == obj)
       return true;
     if (obj == null)
@@ -101,6 +103,11 @@
   }
   
   @Override
+  public boolean equals(final Object obj) {
+    return equalVersions(obj);
+  }
+  
+  @Override
   public int hashCode() {
      int prime = 31;
     int result = 1;
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPayment.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPayment.java
index 337e855..a8b4ebe 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPayment.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPayment.java
@@ -15,10 +15,8 @@
 package org.osbp.tests.entities;
 
 import java.util.Date;
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PreRemove;
@@ -44,14 +42,14 @@
   private Date now;
   
   @Column(name = "PAYED")
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double payed;
   
-  @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+  @ManyToOne
   @JoinColumn(name = "SLIP_ID")
   private CashSlip slip;
   
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "METHOD_OF_PAYMENT_ID")
   private CashPaymentMethod methodOfPayment;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPaymentMethod.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPaymentMethod.java
index 40cc30c..365fa2e 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPaymentMethod.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPaymentMethod.java
@@ -17,8 +17,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
@@ -33,7 +35,7 @@
 import org.osbp.tests.entities.CashPayment;
 
 @Entity
-@Table(name = "CASH_PAYMENT_METHOD", indexes = @Index(name = "paymentNumIndex", unique = true, columnList = "num"))
+@Table(name = "CASH_PAYMENT_METHOD", indexes = @Index(name = "PAYMENT_NUM_INDEX", unique = true, columnList = "NUM"))
 @SuppressWarnings("all")
 public class CashPaymentMethod extends BaseUUID implements IEntity {
   @DomainKey
@@ -54,7 +56,7 @@
   private double lowerLimit;
   
   @JoinColumn(name = "PAYMENTS_ID")
-  @OneToMany(mappedBy = "methodOfPayment")
+  @OneToMany(mappedBy = "methodOfPayment", cascade = CascadeType.MERGE, orphanRemoval = false, fetch = FetchType.LAZY)
   @Noncacheable
   private List<CashPayment> payments;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPosition.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPosition.java
index b6ff39f..99b84e7 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPosition.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashPosition.java
@@ -15,10 +15,8 @@
 package org.osbp.tests.entities;
 
 import java.util.Date;
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PreRemove;
@@ -46,14 +44,14 @@
   private double quantity;
   
   @Column(name = "PRICE")
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double price;
   
   @Column(name = "AMOUNT")
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double amount;
   
-  @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+  @ManyToOne
   @JoinColumn(name = "SLIP_ID")
   private CashSlip slip;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashRegister.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashRegister.java
index e9a80da..982a5ae 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashRegister.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashRegister.java
@@ -18,8 +18,10 @@
 import java.util.Collections;
 import java.util.List;
 import javax.persistence.Cacheable;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
@@ -33,7 +35,7 @@
 import org.osbp.tests.entities.CashSlip;
 
 @Entity
-@Table(name = "CASH_REGISTER", indexes = { @Index(name = "cashIpIndex", unique = true, columnList = "ip"), @Index(name = "cashNumIndex", unique = true, columnList = "num") })
+@Table(name = "CASH_REGISTER", indexes = { @Index(name = "CASH_IP_INDEX", unique = true, columnList = "IP"), @Index(name = "CASH_NUM_INDEX", unique = true, columnList = "NUM") })
 @Cacheable
 @SuppressWarnings("all")
 public class CashRegister extends BaseUUID implements IEntity {
@@ -51,7 +53,7 @@
   private String currentDay;
   
   @JoinColumn(name = "SLIPS_ID")
-  @OneToMany(mappedBy = "register")
+  @OneToMany(mappedBy = "register", cascade = CascadeType.MERGE, orphanRemoval = false, fetch = FetchType.LAZY)
   @Noncacheable
   private List<CashSlip> slips;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashSlip.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashSlip.java
index 45c6ed0..969c3c0 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashSlip.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CashSlip.java
@@ -46,7 +46,7 @@
 import org.osbp.tests.entities.Mcustomer;
 
 @Entity
-@Table(name = "CASH_SLIP", indexes = { @Index(name = "currentDay_index", columnList = "currentDay"), @Index(name = "serial_index", columnList = "currentDay, serial") })
+@Table(name = "CASH_SLIP", indexes = { @Index(name = "CURRENT_DAY_INDEX", columnList = "CURRENT_DAY"), @Index(name = "SERIAL_INDEX", columnList = "CURRENT_DAY, SERIAL") })
 @SuppressWarnings("all")
 public class CashSlip extends BaseUUID implements IEntity {
   @Column(name = "CURRENT_DAY")
@@ -61,7 +61,7 @@
   private String cashier;
   
   @Column(name = "TOTAL")
-  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren;"))
+  @Properties(properties = @Property(key = "decimalformat", value = "###,##0.00 &curren"))
   private Double total;
   
   @GeneratedValue
@@ -72,23 +72,21 @@
   private boolean payed;
   
   @JoinColumn(name = "POSITIONS_ID")
-  @OneToMany(mappedBy = "slip", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "slip", cascade = { CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true, fetch = FetchType.EAGER)
   @Noncacheable
-  @Valid
   private List<CashPosition> positions;
   
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "CUSTOMER_ID")
   private Mcustomer customer;
   
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "REGISTER_ID")
   private CashRegister register;
   
   @JoinColumn(name = "PAYMENTS_ID")
-  @OneToMany(mappedBy = "slip", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "slip", cascade = { CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true, fetch = FetchType.EAGER)
   @Noncacheable
-  @Valid
   private List<CashPayment> payments;
   
   /**
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Company.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Company.java
index 17aaae7..67fde4c 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Company.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Company.java
@@ -26,7 +26,6 @@
 import javax.persistence.OneToMany;
 import javax.persistence.PreRemove;
 import javax.persistence.Table;
-import javax.validation.Valid;
 import org.eclipse.osbp.dsl.common.datatypes.IEntity;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
@@ -47,7 +46,7 @@
   /**
    * the company group if any
    */
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "COMPANY_GROUP_ID")
   private CompanyGroup company_group;
   
@@ -67,7 +66,7 @@
   /**
    * relation of the company to the PIM owner
    */
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "RELATION_TYPE_ID")
   private CompanyRelationType relation_type;
   
@@ -75,18 +74,16 @@
    * any number of addresses
    */
   @JoinColumn(name = "ADDRESS_ID")
-  @OneToMany(mappedBy = "company", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "company", cascade = { CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true, fetch = FetchType.EAGER)
   @Noncacheable
-  @Valid
   private List<Address> address;
   
   /**
    * departments of this company
    */
   @JoinColumn(name = "DEPARTMENTS_ID")
-  @OneToMany(mappedBy = "company", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "company", cascade = { CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true, fetch = FetchType.EAGER)
   @Noncacheable
-  @Valid
   private List<Department> departments;
   
   /**
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CompanyGroup.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CompanyGroup.java
index 6f9851f..24caf2f 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CompanyGroup.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/CompanyGroup.java
@@ -17,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -55,7 +56,7 @@
   /**
    * the main company
    */
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "MAIN_COMPANY_ID")
   private Company main_company;
   
@@ -63,7 +64,7 @@
    * group of companies
    */
   @JoinColumn(name = "COMPANIES_ID")
-  @OneToMany(mappedBy = "company_group")
+  @OneToMany(mappedBy = "company_group", cascade = CascadeType.MERGE, orphanRemoval = false, fetch = FetchType.LAZY)
   @Noncacheable
   private List<Company> companies;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Department.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Department.java
index 85b9a6f..3fcaa08 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Department.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Department.java
@@ -26,7 +26,6 @@
 import javax.persistence.OneToMany;
 import javax.persistence.PreRemove;
 import javax.persistence.Table;
-import javax.validation.Valid;
 import org.eclipse.osbp.dsl.common.datatypes.IEntity;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
@@ -45,7 +44,7 @@
   /**
    * the company
    */
-  @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+  @ManyToOne
   @JoinColumn(name = "COMPANY_ID")
   private Company company;
   
@@ -66,9 +65,8 @@
    * any number of addresses
    */
   @JoinColumn(name = "ADDRESS_ID")
-  @OneToMany(mappedBy = "department", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "department", cascade = { CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true, fetch = FetchType.EAGER)
   @Noncacheable
-  @Valid
   private List<Address> address;
   
   /**
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestBean.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestBean.java
index a36ee96..2ebc2ac 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestBean.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestBean.java
@@ -17,11 +17,11 @@
 import java.io.Serializable;
 import javax.persistence.Basic;
 import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
 import org.eclipse.osbp.dsl.common.datatypes.IBean;
+import org.eclipse.osbp.runtime.common.annotations.Dirty;
 import org.eclipse.osbp.runtime.common.annotations.Dispose;
 import org.osbp.tests.entities.DtoTestChildCrossRef;
 
@@ -32,10 +32,13 @@
   @Dispose
   private boolean disposed;
   
+  @Dirty
+  private transient boolean dirty;
+  
   @Basic
   private String foo;
   
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "crossRefChild")
   private DtoTestChildCrossRef crossRefChild;
   
@@ -51,6 +54,22 @@
   }
   
   /**
+   * @return true, if the object is dirty. 
+   * 
+   */
+  public boolean isDirty() {
+    return dirty;
+  }
+  
+  /**
+   * Sets the dirty state of this object.
+   * 
+   */
+  public void setDirty(final boolean dirty) {
+    this.dirty = dirty;
+  }
+  
+  /**
    * Checks whether the object is disposed.
    * @throws RuntimeException if the object is disposed.
    */
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildContainment.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildContainment.java
index c5a1fa6..1b54da5 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildContainment.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildContainment.java
@@ -14,9 +14,7 @@
  */
 package org.osbp.tests.entities;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PreRemove;
@@ -30,7 +28,7 @@
 @Table(name = "DTO_TEST_CHILD_CONTAINMENT")
 @SuppressWarnings("all")
 public class DtoTestChildContainment extends BaseUUID implements IEntity {
-  @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+  @ManyToOne
   @JoinColumn(name = "CONTAINER_ID")
   private DtoTestParent container;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildCrossRef.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildCrossRef.java
index 1e4ad15..eef7fdf 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildCrossRef.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestChildCrossRef.java
@@ -15,7 +15,6 @@
 package org.osbp.tests.entities;
 
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PreRemove;
@@ -29,7 +28,7 @@
 @Table(name = "DTO_TEST_CHILD_CROSS_REF")
 @SuppressWarnings("all")
 public class DtoTestChildCrossRef extends BaseUUID implements IEntity {
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "CONTAINER_ID")
   private DtoTestParent container;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestParent.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestParent.java
index 7f692fe..0801551 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestParent.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/DtoTestParent.java
@@ -48,17 +48,16 @@
   private String string;
   
   @JoinColumn(name = "CONTAINMENT_CHILDS_ID")
-  @OneToMany(mappedBy = "container", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "container", cascade = { CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true, fetch = FetchType.EAGER)
   @Noncacheable
-  @Valid
   private List<DtoTestChildContainment> containmentChilds;
   
   @JoinColumn(name = "CROSS_REF_CHILDS_ID")
-  @OneToMany(mappedBy = "container")
+  @OneToMany(mappedBy = "container", cascade = CascadeType.MERGE, orphanRemoval = false, fetch = FetchType.LAZY)
   @Noncacheable
   private List<DtoTestChildCrossRef> crossRefChilds;
   
-  @ManyToOne(fetch = FetchType.LAZY)
+  @ManyToOne
   @JoinColumn(name = "CROSS_REF_CHILD_ID")
   private DtoTestChildCrossRef crossRefChild;
   
diff --git a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Mcustomer.java b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Mcustomer.java
index be84de9..05ef4d8 100644
--- a/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Mcustomer.java
+++ b/org.eclipse.osbp.runtime.tests/src-gen/org/osbp/tests/entities/Mcustomer.java
@@ -18,8 +18,10 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.PreRemove;
@@ -126,7 +128,7 @@
   private String test;
   
   @JoinColumn(name = "SLIPS_ID")
-  @OneToMany(mappedBy = "customer")
+  @OneToMany(mappedBy = "customer", cascade = CascadeType.MERGE, orphanRemoval = false, fetch = FetchType.LAZY)
   @Noncacheable
   private List<CashSlip> slips;
   
diff --git a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractBean.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractBean.java
index cbac52a..cfd450a 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractBean.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractBean.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractJPATest.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractJPATest.java
index edf3659..9376742 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractJPATest.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/AbstractJPATest.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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
  */
 package org.eclipse.osbp.runtime.tests;
 
diff --git a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Activator.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Activator.java
index b57ca36..9889012 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Activator.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Bar.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Bar.java
index d5448c7..a6594bc 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Bar.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Bar.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.runtime.tests/src/org/eclipse/osbp/runtime/tests/BarHashById.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/BarHashById.java
index b6d27f1..37e8575 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/BarHashById.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/BarHashById.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.runtime.tests/src/org/eclipse/osbp/runtime/tests/DefaultUI.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/DefaultUI.java
index f018b0c..f40d262 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/DefaultUI.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/DefaultUI.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Foo.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Foo.java
index d98aeaa..1b423fe 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Foo.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/Foo.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.runtime.tests/src/org/eclipse/osbp/runtime/tests/ValueBean.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/ValueBean.java
index 7eaddb0..a8af744 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/ValueBean.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/ValueBean.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.runtime.tests/src/org/eclipse/osbp/runtime/tests/dtoandui/BoundCashTests.java b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/dtoandui/BoundCashTests.java
index 55e8224..1dfbb44 100644
--- a/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/dtoandui/BoundCashTests.java
+++ b/org.eclipse.osbp.runtime.tests/src/org/eclipse/osbp/runtime/tests/dtoandui/BoundCashTests.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.runtime.web.atmosphere.fragment/LICENSE.txt b/org.eclipse.osbp.runtime.web.atmosphere.fragment/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.atmosphere.fragment/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.atmosphere.fragment/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.atmosphere.fragment/about.html b/org.eclipse.osbp.runtime.web.atmosphere.fragment/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.runtime.web.atmosphere.fragment/about.html
+++ b/org.eclipse.osbp.runtime.web.atmosphere.fragment/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 (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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 (&quot;EPL&quot;).  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, &quot;Program&quot; 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.runtime.web.atmosphere.fragment/about.properties b/org.eclipse.osbp.runtime.web.atmosphere.fragment/about.properties
index 471d894..95d712f 100644
--- a/org.eclipse.osbp.runtime.web.atmosphere.fragment/about.properties
+++ b/org.eclipse.osbp.runtime.web.atmosphere.fragment/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 @@
 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.runtime.web.atmosphere.fragment/pom.xml b/org.eclipse.osbp.runtime.web.atmosphere.fragment/pom.xml
index 79932fc..390230a 100644
--- a/org.eclipse.osbp.runtime.web.atmosphere.fragment/pom.xml
+++ b/org.eclipse.osbp.runtime.web.atmosphere.fragment/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.runtime.web.common.tests/LICENSE.txt b/org.eclipse.osbp.runtime.web.common.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.common.tests/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.common.tests/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.common.tests/pom.xml b/org.eclipse.osbp.runtime.web.common.tests/pom.xml
index 3d06db2..45378d4 100644
--- a/org.eclipse.osbp.runtime.web.common.tests/pom.xml
+++ b/org.eclipse.osbp.runtime.web.common.tests/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.runtime.web.common.tests/src/org/eclipse/osbp/runtime/web/common/tests/Activator.java b/org.eclipse.osbp.runtime.web.common.tests/src/org/eclipse/osbp/runtime/web/common/tests/Activator.java
index 05200d0..b22db87 100644
--- a/org.eclipse.osbp.runtime.web.common.tests/src/org/eclipse/osbp/runtime/web/common/tests/Activator.java
+++ b/org.eclipse.osbp.runtime.web.common.tests/src/org/eclipse/osbp/runtime/web/common/tests/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/LICENSE.txt b/org.eclipse.osbp.runtime.web.common/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.common/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.common/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.common/about.html b/org.eclipse.osbp.runtime.web.common/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.runtime.web.common/about.html
+++ b/org.eclipse.osbp.runtime.web.common/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 (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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 (&quot;EPL&quot;).  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, &quot;Program&quot; 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.runtime.web.common/about.properties b/org.eclipse.osbp.runtime.web.common/about.properties
index fbde109..1e4b481 100644
--- a/org.eclipse.osbp.runtime.web.common/about.properties
+++ b/org.eclipse.osbp.runtime.web.common/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 @@
 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.runtime.web.common/pom.xml b/org.eclipse.osbp.runtime.web.common/pom.xml
index 7b96121..db1bfcf 100644
--- a/org.eclipse.osbp.runtime.web.common/pom.xml
+++ b/org.eclipse.osbp.runtime.web.common/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.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/ContextAccess.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/ContextAccess.java
index c966204..55ad6ee 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/ContextAccess.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/ContextAccess.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IConstants.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IConstants.java
index fd7155b..fb9d3b9 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IConstants.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IConstants.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContext.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContext.java
index d81a2cc..98c0323 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContext.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContext.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContextRegistry.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContextRegistry.java
index 9d1a740..a009a44 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContextRegistry.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/IWebContextRegistry.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractUserInfo.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractUserInfo.java
index 928b835..d784d29 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractUserInfo.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractUserInfo.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContext.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContext.java
index b47384d..404a5aa 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContext.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContext.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContextRegistry.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContextRegistry.java
index 2fd4356..51bdfb4 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContextRegistry.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/AbstractWebContextRegistry.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/preferences/UserScope.java b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/preferences/UserScope.java
index 5b16b11..744d3ce 100644
--- a/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/preferences/UserScope.java
+++ b/org.eclipse.osbp.runtime.web.common/src/org/eclipse/osbp/runtime/web/common/context/preferences/UserScope.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/LICENSE.txt b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.ecview.presentation.vaadin.tests.ui.tests/pom.xml b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/pom.xml
index 4498fb7..a8b8c0d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/pom.xml
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/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: -->
 <!--# Florian Pirchner - initial API and implementation -->
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java
index 3a709c2..055a6a9 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java
index ae16763..0219982 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java
index 9fd4cf4..ca6cbf0 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java
index 9f45cc1..5c50485 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java
index fd06653..4fddafb 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java
index 9dd2748..ddb9cec 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java
@@ -1,9 +1,11 @@
  /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java
index ec4e364..7f0be63 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java
index f554b58..b0d3493 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java
index 6ba3607..89158a7 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java
index 8cf5dba..6d39813 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java
index 6d19b0b..1a513af 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java
index 91d117f..fbb7cd6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java
index 6912e3f..d03c4be 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java
index b4b86ce..dfd5910 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java
index 3a57b77..eaf6552 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java
index ac981dd..3493c70 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java
index 2d3ec9b..a40142a 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java
index a291250..681ee3d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java
index 919dec6..4d44199 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java
index c35663e..4e00edb 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java
index d9479da..a4f84ce 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java
index 7ef3228..f7b566e 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/LICENSE.txt b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.ecview.presentation.vaadin.tests.ui/about.html b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/about.html
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/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 (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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 (&quot;EPL&quot;).  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, &quot;Program&quot; 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.runtime.web.ecview.presentation.vaadin.tests.ui/about.properties b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/about.properties
index 0b9ef63..336df03 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/about.properties
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/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 @@
 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.runtime.web.ecview.presentation.vaadin.tests.ui/pom.xml b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/pom.xml
index 3b23e13..dc9ba52 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/pom.xml
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/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: -->
 <!--# Florian Pirchner - initial API and implementation -->
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java
index 3a709c2..055a6a9 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java
index ae16763..0219982 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/DummyApplication.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java
index 72b0076..e6e5880 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServlet.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java
index 9f45cc1..5c50485 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsServletService.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java
index 6636a1b..8cd6e93 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ECViewTestsUI.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java
index 9dd2748..ddb9cec 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/ResourceProvider.java
@@ -1,9 +1,11 @@
  /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java
index ec4e364..7f0be63 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/AbstractBean.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java
index 2ce0830..bc1f4af 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/CheckBoxSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java
index af07071..eeb6edb 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DatetimeFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java
index 391679b..7cc9240 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/DecimalFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java
index a958574..ca5eac4 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/EnabledSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java
index 34ac4d9..f7412a1 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ExecutableSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java
index 2a403d1..053b7a6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ListSelectSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java
index 2394440..c743424 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/MasterDetailSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java
index bf75e96..4152e3b 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/NumericFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java
index 3080f82..1fcc636 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/OptionsGroupSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java
index 0433d92..47bf1a3 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/ReadonlySample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java
index eb0e43a..7b19d50 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TableSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java
index 0ee8195..c1edb97 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TabsheetSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java
index 82e9d93..4afa5d7 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextAreaSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java
index f63e49b..434fa3d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/TextFieldSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java
index 4008be0..b599425 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests.ui/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ui/samples/VisibleSample.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/LICENSE.txt b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.ecview.presentation.vaadin.tests/pom.xml b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/pom.xml
index db127a4..f30f884 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/pom.xml
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/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: -->
 <!--# Florian Pirchner - initial API and implementation -->
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/Activator.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/Activator.java
index a552726..5e54a9b 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/Activator.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ModelUtilTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ModelUtilTests.java
index b81b522..04aba55 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ModelUtilTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/ModelUtilTests.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfBar.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfBar.java
index 6062291..40957a9 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfBar.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfBar.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfFoo.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfFoo.java
index e4e592e..d8b3a55 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfFoo.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/EmfFoo.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelFactory.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelFactory.java
index 8192aca..f6dc5f3 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelFactory.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelFactory.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelPackage.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelPackage.java
index 80331bf..d2dfa19 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelPackage.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/ModelPackage.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfBarImpl.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfBarImpl.java
index ae29bfa..8b955cc 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfBarImpl.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfBarImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfFooImpl.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfFooImpl.java
index 1dbc154..aa87bdb 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfFooImpl.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/EmfFooImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelFactoryImpl.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelFactoryImpl.java
index ee0b0b7..7049e20 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelFactoryImpl.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelFactoryImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelPackageImpl.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelPackageImpl.java
index 8053052..43e9d27 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelPackageImpl.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/impl/ModelPackageImpl.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2014 - Lunifera GmbH (Gross Enzersdorf, Austria), 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: 
  * 		Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelAdapterFactory.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelAdapterFactory.java
index b19bcf2..dddd419 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelAdapterFactory.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelAdapterFactory.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelSwitch.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelSwitch.java
index 260347f..07cb95d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelSwitch.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/emf/model/util/ModelSwitch.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/AbstractBean.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/AbstractBean.java
index 1bba237..a33544f 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/AbstractBean.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/AbstractBean.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Bar.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Bar.java
index 5acafa0..ee3f8e3 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Bar.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Bar.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/BarHashById.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/BarHashById.java
index b5108b4..d6e1415 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/BarHashById.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/BarHashById.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Foo.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Foo.java
index e9bef89..9a9f8b1 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Foo.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/Foo.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/ValueBean.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/ValueBean.java
index f8deb1f..4b05190 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/ValueBean.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/model/ValueBean.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BindingManagerTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BindingManagerTests.java
index 7561bf3..f3ca255 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BindingManagerTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BindingManagerTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BrowserPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BrowserPresentationTests.java
index 0a36388..f4e4b2d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BrowserPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BrowserPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BundleHelper.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BundleHelper.java
index d6cc2b6..d73b1ef 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BundleHelper.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/BundleHelper.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ButtonPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ButtonPresentationTests.java
index 60ca730..f0c49a6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ButtonPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ButtonPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CheckBoxPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CheckBoxPresentationTests.java
index e667e51..fb90f06 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CheckBoxPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CheckBoxPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ComboBoxPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ComboBoxPresentationTests.java
index 2203a9f..95a94f2 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ComboBoxPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ComboBoxPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CssLayoutPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CssLayoutPresentationTests.java
index 649f8e9..07758ea 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CssLayoutPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/CssLayoutPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DateTimePresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DateTimePresentationTests.java
index fba1d32..461bd59 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DateTimePresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DateTimePresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DecimalFieldPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DecimalFieldPresentationTests.java
index e7f3acd..f381785 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DecimalFieldPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DecimalFieldPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultUI.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultUI.java
index 652f080..db8be92 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultUI.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultUI.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultViewContext.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultViewContext.java
index 252a3dc..f8face3 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultViewContext.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/DefaultViewContext.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 Lunifera GmbH (Gross Enzersdorf), 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:
  *    Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/FormLayoutPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/FormLayoutPresentationTests.java
index 7c429a1..9baca06 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/FormLayoutPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/FormLayoutPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/HorizontalLayoutPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/HorizontalLayoutPresentationTests.java
index e92eea3..bb42e5a 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/HorizontalLayoutPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/HorizontalLayoutPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/I18nServiceForTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/I18nServiceForTests.java
index 2719ad8..bc41743 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/I18nServiceForTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/I18nServiceForTests.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/LabelPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/LabelPresentationTests.java
index 2f7aada..862f762 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/LabelPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/LabelPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ListPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ListPresentationTests.java
index e072391..07ae45b 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ListPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ListPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/NumericFieldPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/NumericFieldPresentationTests.java
index 340fcdb..a57a820 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/NumericFieldPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/NumericFieldPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/OptionsGroupPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/OptionsGroupPresentationTests.java
index 9641f50..44d0f4f 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/OptionsGroupPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/OptionsGroupPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ProgressBarPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ProgressBarPresentationTests.java
index e2eeaae..5bff298 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ProgressBarPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/ProgressBarPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/SliderPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/SliderPresentationTests.java
index 0709728..bf66110 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/SliderPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/SliderPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TabSheetPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TabSheetPresentationTests.java
index a1bae88..54591c6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TabSheetPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TabSheetPresentationTests.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.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TablePresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TablePresentationTests.java
index 45113a0..624b051 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TablePresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TablePresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextAreaPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextAreaPresentationTests.java
index ba9969a..9807dde 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextAreaPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextAreaPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextFieldPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextFieldPresentationTests.java
index c8be0f0..11311b2 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextFieldPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TextFieldPresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TreePresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TreePresentationTests.java
index 0be566f..e307bfe 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TreePresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/TreePresentationTests.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2012, 2015 - Lunifera GmbH (Austria), Loetz GmbH&Co.KG and others.
  * 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:
  * Florian Pirchner - initial API and implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/VerticallLayoutPresentationTests.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/VerticallLayoutPresentationTests.java
index c9b57ec..a757bca 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/VerticallLayoutPresentationTests.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.tests/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/tests/presentation/VerticallLayoutPresentationTests.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/LICENSE.txt b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/LICENSE.txt
index ff42ad4..fc5938d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/LICENSE.txt
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/LICENSE.txt
@@ -1,161 +1,140 @@
-Eclipse Public License -v 1.0
+Eclipse Foundation Software User Agreement
 
-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.
+November 22, 2017
 
-1. DEFINITIONS
+Usage Of Content
 
-"Contribution" means:
+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.
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+Applicable Licenses
 
-b) in the case of each subsequent Contributor:
+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.
 
-i) changes to the Program, and
+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").
 
-ii) additions to the Program;
+-   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.
 
-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.
+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:
 
-"Contributor" means any person or entity that distributes the Program.
+-   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
 
-"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.
+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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+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):
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-   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)
 
-2. GRANT OF RIGHTS
+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.
 
-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.
+Use of Provisioning Technology
 
-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.
+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").
 
-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.
+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:
 
-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.
+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.
 
-3. REQUIREMENTS
+Cryptography
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+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.
 
-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
+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.runtime.web.ecview.presentation.vaadin/META-INF/MANIFEST.MF b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/META-INF/MANIFEST.MF
index 1d882c2..10652aa 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/META-INF/MANIFEST.MF
@@ -35,7 +35,8 @@
  org.eclipse.osbp.ui.api;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.dsl.dto.xtext;bundle-version="0.9.0",
  org.eclipse.osbp.blob;bundle-version="0.9.0",
- org.eclipse.osbp.vaadin.addons.kanban;bundle-version="0.9.0"
+ org.eclipse.osbp.vaadin.addons.kanban;bundle-version="0.9.0",
+ org.eclipse.e4.core.contexts;bundle-version="1.5.1"
 Import-Package: org.eclipse.osbp.ecview.extension.api;version="0.9.0",
  org.osgi.framework;version="1.7.0",
  org.osgi.service.component.annotations;version="1.2.0",
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/about.html b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/about.html
index 64c0598..e8b834d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/about.html
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/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 (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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 (&quot;EPL&quot;).  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, &quot;Program&quot; 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.runtime.web.ecview.presentation.vaadin/about.properties b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/about.properties
index f30ea95..adb78c2 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/about.properties
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/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 @@
 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.runtime.web.ecview.presentation.vaadin/pom.xml b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/pom.xml
index 8b667d1..4de9d0c 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/pom.xml
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/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.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/Activator.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/Activator.java
index 9fbbdaf..3b60c99 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/Activator.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/Activator.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IBindingManager.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IBindingManager.java
index a2f44dc..7bc9a84 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IBindingManager.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IBindingManager.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IConstants.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IConstants.java
index ee991af..09c4975 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IConstants.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/IConstants.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/VaadinRenderer.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/VaadinRenderer.java
index a2b2130..6c217bf 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/VaadinRenderer.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/VaadinRenderer.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractEmbeddedWidgetPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractEmbeddedWidgetPresenter.java
index 2337a23..be28384 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractEmbeddedWidgetPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractEmbeddedWidgetPresenter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java
index 761072b..9926e24 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -348,12 +350,7 @@
 			if (validators != null) {
 				List<IStatus> statuses = new ArrayList<IStatus>();
 				for (IValidator validator : validators.keySet()) {
-					// do not pass status from the externalStatusValidator to
-					// the listeners.
-					// they have been added from there. So there is no need.
-					if (validator != externalStatusValidator) {
-						statuses.addAll(validator.getCurrentStatus());
-					}
+					statuses.addAll(validator.getCurrentStatus());
 				}
 				service.registerResult(getModel(), statuses);
 			}
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractLayoutPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractLayoutPresenter.java
index 592b85e..fad5217 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractLayoutPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractLayoutPresenter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabPresenter.java
index d883f5f..33ee0cb 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabPresenter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabSheetPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabSheetPresenter.java
index 3e6efe3..1f57219 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabSheetPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractTabSheetPresenter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractVaadinWidgetPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractVaadinWidgetPresenter.java
index edf1c4f..89870dd 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractVaadinWidgetPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractVaadinWidgetPresenter.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/ClassLoaderResource.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/ClassLoaderResource.java
new file mode 100644
index 0000000..9783aab
--- /dev/null
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/ClassLoaderResource.java
@@ -0,0 +1,116 @@
+package org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.vaadin.server.ConnectorResource;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.util.FileTypeResolver;
+
+@SuppressWarnings("serial")
+public class ClassLoaderResource implements ConnectorResource {
+    /**
+     * Default buffer size for this stream resource.
+     */
+    private int bufferSize = 0;
+
+    /**
+     * Default cache time for this stream resource.
+     */
+    private long cacheTime = DownloadStream.DEFAULT_CACHETIME;
+
+	private transient ClassLoader classLoader;
+
+	private String fileName;
+
+	/**
+	 * Loads a resource from an OSGi-bundle with the given classloader and filename
+	 * 
+	 * @param classLoader
+	 * @param fileName
+	 */
+    public ClassLoaderResource(ClassLoader classLoader, String fileName) {
+        if (fileName == null) {
+            throw new IllegalArgumentException("FileName cannot be null");
+        }
+        if(classLoader == null) {
+            throw new IllegalArgumentException("ClassLoader cannot be null");
+        }
+        this.classLoader = classLoader;
+        this.fileName = fileName;
+    }
+
+    @Override
+    public DownloadStream getStream() {
+    	InputStream stream = classLoader.getResourceAsStream(fileName);
+        final DownloadStream ds = new DownloadStream(stream,
+		        getMIMEType(),
+		        getFilename());
+		try {
+			ds.setParameter("Content-Length", String.valueOf(stream.available()));
+		} catch (IOException e) {
+		}
+
+		ds.setCacheTime(cacheTime);
+		return ds;
+    }
+
+    @Override
+    public String getFilename() {
+        return fileName;
+    }
+
+    @Override
+    public String getMIMEType() {
+        return FileTypeResolver.getMIMEType(fileName);
+    }
+
+    /**
+     * Gets the length of cache expiration time. This gives the adapter the
+     * possibility cache streams sent to the client. The caching may be made in
+     * adapter or at the client if the client supports caching. Default is
+     * <code>DownloadStream.DEFAULT_CACHETIME</code>.
+     *
+     * @return Cache time in milliseconds.
+     */
+    public long getCacheTime() {
+        return cacheTime;
+    }
+
+    /**
+     * Sets the length of cache expiration time. This gives the adapter the
+     * possibility cache streams sent to the client. The caching may be made in
+     * adapter or at the client if the client supports caching. Zero or negavive
+     * value disbales the caching of this stream.
+     *
+     * @param cacheTime
+     *            the cache time in milliseconds.
+     */
+    public void setCacheTime(long cacheTime) {
+        this.cacheTime = cacheTime;
+    }
+
+    /**
+     * Gets the size of the download buffer used for this resource.
+     *
+     * <p>
+     * If the buffer size is 0, the buffer size is decided by the terminal
+     * adapter. The default value is 0.
+     * </p>
+     *
+     * @return the size of the buffer in bytes.
+     */
+    public int getBufferSize() {
+        return bufferSize;
+    }
+
+    /**
+     * Sets the size of the download buffer used for this resource.
+     *
+     * @param bufferSize
+     *            the size of the buffer in bytes.
+     */
+    public void setBufferSize(int bufferSize) {
+        this.bufferSize = bufferSize;
+    }
+}
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/AbsoluteLayoutPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/AbsoluteLayoutPresentation.java
index 6dc208d..7513074 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/AbsoluteLayoutPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/AbsoluteLayoutPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BeanReferenceFieldPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BeanReferenceFieldPresentation.java
index 1a5acab..2afde27 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BeanReferenceFieldPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BeanReferenceFieldPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BooleanSearchFieldPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BooleanSearchFieldPresentation.java
index 2a8260f..acba339 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BooleanSearchFieldPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BooleanSearchFieldPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BrowserPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BrowserPresentation.java
index bde9b3c..ef8d312 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BrowserPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/BrowserPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ButtonPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ButtonPresentation.java
index 5474032..c3886e6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ButtonPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ButtonPresentation.java
@@ -1,8 +1,10 @@
 /**
  * Copyright (c) 2013 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * terms of the Eclipse Public License 2.0  which accompanies this distribution,
+t https://www.eclipse.org/legal/epl-2.0/
+t
+t SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors: Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
  */
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CheckBoxPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CheckBoxPresentation.java
index 7f530dd..b3cc3b0 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CheckBoxPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CheckBoxPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -15,6 +17,7 @@
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.emf.databinding.EMFObservables;
+import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.osbp.ecview.core.common.editpart.IElementEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableBindingEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableValueEndpoint;
@@ -29,21 +32,21 @@
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.CustomField;
 import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
 
-// TODO: Auto-generated Javadoc
 /**
  * This presenter is responsible to render a checkBox on the given layout.
  */
-public class CheckBoxPresentation extends
-		AbstractFieldWidgetPresenter<Component> {
+public class CheckBoxPresentation extends AbstractFieldWidgetPresenter<Component> {
 
 	/** The model access. */
 	private final ModelAccess modelAccess;
-	
+
 	/** The check box. */
-	private CustomField checkBox;
-	
+	private CustomCheckboxField checkBox;
+
 	/** The property. */
 	private ObjectProperty<Boolean> property;
 
@@ -65,7 +68,7 @@
 	public Component doCreateWidget(Object parent) {
 		if (checkBox == null) {
 
-			checkBox = new CustomField();
+			checkBox = new CustomCheckboxField();
 			checkBox.addStyleName(CSS_CLASS_CONTROL);
 			checkBox.setImmediate(true);
 			setupComponent(checkBox, getCastedModel());
@@ -94,8 +97,11 @@
 		return checkBox;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractVaadinWidgetPresenter#doUpdateLocale(java.util.Locale)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.
+	 * AbstractVaadinWidgetPresenter#doUpdateLocale(java.util.Locale)
 	 */
 	@Override
 	protected void doUpdateLocale(Locale locale) {
@@ -110,34 +116,41 @@
 	 * Applies the labels to the widgets.
 	 */
 	protected void applyCaptions() {
-		Util.applyCaptions(getI18nService(), modelAccess.getLabel(),
-				modelAccess.getLabelI18nKey(), getLocale(), checkBox);
+		Util.applyCaptions(getI18nService(), modelAccess.getLabel(), modelAccess.getLabelI18nKey(), getLocale(),
+				checkBox);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractFieldWidgetPresenter#doGetField()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.
+	 * AbstractFieldWidgetPresenter#doGetField()
 	 */
 	@Override
 	protected Field<?> doGetField() {
+		if (checkBox == null) {
+			return null;
+		}
 		return checkBox;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractVaadinWidgetPresenter#internalGetObservableEndpoint(org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableBindingEndpoint)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.
+	 * AbstractVaadinWidgetPresenter#internalGetObservableEndpoint(org.eclipse.
+	 * osbp.ecview.core.common.model.core.YEmbeddableBindingEndpoint)
 	 */
 	@Override
-	protected IObservable internalGetObservableEndpoint(
-			YEmbeddableBindingEndpoint bindableValue) {
+	protected IObservable internalGetObservableEndpoint(YEmbeddableBindingEndpoint bindableValue) {
 		if (bindableValue == null) {
-			throw new IllegalArgumentException(
-					"BindableValue must not be null!");
+			throw new IllegalArgumentException("BindableValue must not be null!");
 		}
 
 		if (bindableValue instanceof YEmbeddableValueEndpoint) {
 			return internalGetValueEndpoint();
 		}
-		throw new IllegalArgumentException("Not a valid input: "
-				+ bindableValue);
+		throw new IllegalArgumentException("Not a valid input: " + bindableValue);
 	}
 
 	/**
@@ -147,8 +160,7 @@
 	 */
 	protected IObservableValue internalGetValueEndpoint() {
 		// return the observable value for text
-		return EMFObservables.observeValue(castEObject(getModel()),
-				ExtensionModelPackage.Literals.YCHECK_BOX__VALUE);
+		return EMFObservables.observeValue(castEObject(getModel()), ExtensionModelPackage.Literals.YCHECK_BOX__VALUE);
 	}
 
 	/**
@@ -159,24 +171,32 @@
 	 * @param field
 	 *            the field
 	 */
-	protected void createBindings(YCheckBox yField, CheckBox field) {
+	protected void createBindings(YCheckBox yField, CustomCheckboxField field) {
 		// create the model binding from ridget to ECView-model
-		registerBinding(createBindings_Value(castEObject(getModel()),
-				ExtensionModelPackage.Literals.YCHECK_BOX__VALUE, field));
+		registerBinding(
+				createBindings_Value(castEObject(getModel()), ExtensionModelPackage.Literals.YCHECK_BOX__VALUE, field));
 
 		super.createBindings(yField, field, null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#getWidget()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#
+	 * getWidget()
 	 */
 	@Override
 	public Component getWidget() {
 		return checkBox;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#isRendered()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#
+	 * isRendered()
 	 */
 	@Override
 	public boolean isRendered() {
@@ -221,7 +241,7 @@
 	 * A helper class.
 	 */
 	private static class ModelAccess {
-		
+
 		/** The y field. */
 		private final YCheckBox yField;
 
@@ -280,8 +300,7 @@
 		 * @return the label
 		 */
 		public String getLabel() {
-			return yField.getDatadescription() != null ? yField
-					.getDatadescription().getLabel() : null;
+			return yField.getDatadescription() != null ? yField.getDatadescription().getLabel() : null;
 		}
 
 		/**
@@ -290,8 +309,7 @@
 		 * @return the label i18n key
 		 */
 		public String getLabelI18nKey() {
-			return yField.getDatadescription() != null ? yField
-					.getDatadescription().getLabelI18nKey() : null;
+			return yField.getDatadescription() != null ? yField.getDatadescription().getLabelI18nKey() : null;
 		}
 	}
 
@@ -299,14 +317,55 @@
 	 * The Class CustomField.
 	 */
 	@SuppressWarnings("serial")
-	private class CustomField extends CheckBox {
+	private class CustomCheckboxField extends CustomField<Boolean> {
 
-		/* (non-Javadoc)
+		private CheckBox checkBox;
+		private ObjectProperty<Boolean> property;
+
+		public Class<Boolean> getType() {
+			return Boolean.class;
+		}
+
+		@Override
+		protected Component initContent() {
+
+			checkBox = new CheckBox();
+			HorizontalLayout layout = new HorizontalLayout();
+			layout.addComponent(checkBox);
+
+			property = new ObjectProperty<Boolean>(null, Boolean.class);
+			checkBox.setPropertyDataSource(property);
+
+			property.addValueChangeListener(e -> {
+				super.setValue((Boolean) e.getProperty().getValue());
+			});
+
+			return layout;
+		}
+
+		@Override
+		protected void setInternalValue(Boolean newValue) {
+			super.setInternalValue(newValue);
+
+			if (property != null) {
+				property.setValue(newValue);
+			}
+		}
+
+//		@Override
+//		public void setReadOnly(boolean readOnly) {
+//			super.setReadOnly(readOnly);
+//			this.checkBox.setReadOnly(readOnly);
+//		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
 		 * @see com.vaadin.ui.AbstractField#getErrorMessage()
 		 */
 		@Override
 		public ErrorMessage getErrorMessage() {
-			if(isDisposed()) {
+			if (isDisposed()) {
 				// after disposal, Vaadin will call this method once.
 				return null;
 			}
@@ -314,5 +373,6 @@
 			reportValidationError(message);
 			return message;
 		}
+
 	}
 }
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ComboBoxPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ComboBoxPresentation.java
index 7fd33f5..33d05f6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ComboBoxPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ComboBoxPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -64,7 +66,7 @@
 	/** The property. */
 	@SuppressWarnings("rawtypes")
 	private ObjectProperty property;
-
+	
 	/**
 	 * Constructor.
 	 * 
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CssLayoutPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CssLayoutPresentation.java
index 095b94b..57aa089 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CssLayoutPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/CssLayoutPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java
index 9c8d514..4c4c6c3 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -36,32 +38,34 @@
 
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.FontAwesome;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.UI;
+import com.vaadin.ui.themes.ValoTheme;
 
-// TODO: Auto-generated Javadoc
 /**
  * This presenter is responsible to render a text area on the given layout.
  */
-public class DateTimePresentation extends
-		AbstractFieldWidgetPresenter<Component> {
+public class DateTimePresentation extends AbstractFieldWidgetPresenter<Component> {
 
 	/** The model access. */
 	private final ModelAccess modelAccess;
-	
+
 	/** The date field. */
 	private CustomField dateField;
-	
+
 	/** The binding_value to ui. */
 	private Binding binding_valueToUI;
-	
+
 	/** The property. */
 	private ObjectProperty<Date> property;
-	
+
 	/** The format info. */
 	private Info formatInfo;
 
@@ -82,23 +86,22 @@
 	@Override
 	public Component doCreateWidget(Object parent) {
 		if (dateField == null) {
-
 			dateField = new CustomField();
+			dateField.initField();
 			dateField.addStyleName(CSS_CLASS_CONTROL);
 			dateField.setImmediate(true);
-			setupComponent(dateField, getCastedModel());
+			setupComponent(dateField.field, getCastedModel());
 
-			associateWidget(dateField, modelAccess.yField);
-
+			associateWidget(dateField.field, modelAccess.yField);
 			if (modelAccess.isCssIdValid()) {
 				dateField.setId(modelAccess.getCssID());
 			} else {
 				dateField.setId(getEditpart().getId());
 			}
 
-			property = new ObjectProperty<Date>(null, Date.class);
+			property = new ObjectProperty<>(null, Date.class);
 			dateField.setPropertyDataSource(property);
-
+			
 			// creates the binding for the field
 			createBindings(modelAccess.yField, dateField);
 
@@ -121,22 +124,24 @@
 	 * @param yDt
 	 *            the y dt
 	 */
+	@Override
 	protected void doApplyDatatype(YDatatype yDt) {
 		if (dateField == null) {
 			return;
 		}
 
-		IDateFormatProvider service = getViewContext().getService(
-				IDateFormatProvider.class.getName());
+		IDateFormatProvider service = getViewContext().getService(IDateFormatProvider.class.getName());
 		YDateTimeDatatype yDatatype = (YDateTimeDatatype) yDt;
 		if (service != null) {
-			formatInfo = service
-					.getInfo(yDatatype, UI.getCurrent().getLocale());
+			formatInfo = service.getInfo(yDatatype, UI.getCurrent().getLocale());
 		} else {
-			formatInfo = new DefaultDateFormatProvider().getInfo(yDatatype, UI
-					.getCurrent().getLocale());
+			formatInfo = new DefaultDateFormatProvider().getInfo(yDatatype, UI.getCurrent().getLocale());
 		}
-
+		if ( yDatatype != null )  {
+			dateField.setShowISOWeekNumber(yDatatype.isShowISOWeekNumbersActive());
+		} else {
+			dateField.setShowISOWeekNumber(false);		
+		}
 		dateField.setDateFormat(formatInfo.getDateFormat());
 		dateField.setResolution(mapToVaadin(formatInfo.getResolution()));
 	}
@@ -169,8 +174,11 @@
 		return Resolution.DAY;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractVaadinWidgetPresenter#doUpdateLocale(java.util.Locale)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.
+	 * AbstractVaadinWidgetPresenter#doUpdateLocale(java.util.Locale)
 	 */
 	@Override
 	protected void doUpdateLocale(Locale locale) {
@@ -184,34 +192,38 @@
 	 * Applies the labels to the widgets.
 	 */
 	protected void applyCaptions() {
-		Util.applyCaptions(getI18nService(), modelAccess.getLabel(),
-				modelAccess.getLabelI18nKey(), getLocale(), dateField);
+		Util.applyCaptions(getI18nService(), modelAccess.getLabel(), modelAccess.getLabelI18nKey(), getLocale(),
+				dateField);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractFieldWidgetPresenter#doGetField()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.
+	 * AbstractFieldWidgetPresenter#doGetField()
 	 */
 	@Override
 	protected Field<?> doGetField() {
 		return dateField;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractVaadinWidgetPresenter#internalGetObservableEndpoint(org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableBindingEndpoint)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.
+	 * AbstractVaadinWidgetPresenter#internalGetObservableEndpoint(org.eclipse.
+	 * osbp.ecview.core.common.model.core.YEmbeddableBindingEndpoint)
 	 */
 	@Override
-	protected IObservable internalGetObservableEndpoint(
-			YEmbeddableBindingEndpoint bindableValue) {
+	protected IObservable internalGetObservableEndpoint(YEmbeddableBindingEndpoint bindableValue) {
 		if (bindableValue == null) {
-			throw new IllegalArgumentException(
-					"BindableValue must not be null!");
+			throw new IllegalArgumentException("BindableValue must not be null!");
 		}
 
 		if (bindableValue instanceof YEmbeddableValueEndpoint) {
 			return internalGetValueEndpoint();
 		}
-		throw new IllegalArgumentException("Not a valid input: "
-				+ bindableValue);
+		throw new IllegalArgumentException("Not a valid input: " + bindableValue);
 	}
 
 	/**
@@ -221,8 +233,7 @@
 	 */
 	protected IObservableValue internalGetValueEndpoint() {
 		// return the observable value for text
-		return EMFObservables.observeValue(castEObject(getModel()),
-				ExtensionModelPackage.Literals.YDATE_TIME__VALUE);
+		return EMFObservables.observeValue(castEObject(getModel()), ExtensionModelPackage.Literals.YDATE_TIME__VALUE);
 	}
 
 	/**
@@ -230,29 +241,38 @@
 	 *
 	 * @param yField
 	 *            the y field
-	 * @param field
+	 * @param customfield
 	 *            the field
 	 */
-	protected void createBindings(YDateTime yField, DateField field) {
+	protected void createBindings(YDateTime yField, CustomField customfield) {
 		// create the model binding from widget to ECView-model
 		binding_valueToUI = createBindingsValue(castEObject(getModel()),
-				ExtensionModelPackage.Literals.YDATE_TIME__VALUE, field, null,
-				null);
+				ExtensionModelPackage.Literals.YDATE_TIME__VALUE, customfield.field, null, null);
 		registerBinding(binding_valueToUI);
 
-		super.createBindings(yField, field, null);
+		super.createBindings(yField, customfield.field, null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#getWidget()
+	
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#
+	 * getWidget()
 	 */
 	@Override
 	public Component getWidget() {
 		return dateField;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#isRendered()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation#
+	 * isRendered()
 	 */
 	@Override
 	public boolean isRendered() {
@@ -269,7 +289,7 @@
 			// unbind all active bindings
 			unbind();
 
-			Component parent = ((Component) dateField.getParent());
+			Component parent = (dateField.getParent());
 			if (parent != null && parent instanceof ComponentContainer) {
 				((ComponentContainer) parent).removeComponent(dateField);
 			}
@@ -297,12 +317,12 @@
 			binding_valueToUI = null;
 		}
 	}
-
+	
 	/**
 	 * A helper class.
 	 */
 	private static class ModelAccess {
-		
+
 		/** The y field. */
 		private final YDateTime yField;
 
@@ -361,8 +381,7 @@
 		 * @return the label
 		 */
 		public String getLabel() {
-			return yField.getDatadescription() != null ? yField
-					.getDatadescription().getLabel() : null;
+			return yField.getDatadescription() != null ? yField.getDatadescription().getLabel() : null;
 		}
 
 		/**
@@ -371,8 +390,7 @@
 		 * @return the label i18n key
 		 */
 		public String getLabelI18nKey() {
-			return yField.getDatadescription() != null ? yField
-					.getDatadescription().getLabelI18nKey() : null;
+			return yField.getDatadescription() != null ? yField.getDatadescription().getLabelI18nKey() : null;
 		}
 
 		/**
@@ -382,8 +400,7 @@
 		 */
 		@SuppressWarnings("unused")
 		public boolean isDateformatValid() {
-			return yField.getDatadescription() != null
-					&& yField.getDatatype().getFormat() != null;
+			return yField.getDatadescription() != null && yField.getDatatype().getFormat() != null;
 		}
 	}
 
@@ -391,9 +408,76 @@
 	 * The Class CustomField.
 	 */
 	@SuppressWarnings("serial")
-	private class CustomField extends DateField {
+	private class CustomField extends com.vaadin.ui.CustomField<Date> {
+		private DateField field;
+		private Button resetDate;
+		private ObjectProperty<Date> property;
+		private boolean showISOWeekNumber;
 
-		/* (non-Javadoc)
+		@Override
+		protected Component initContent() {
+			field.setShowISOWeekNumbers(showISOWeekNumber);
+			property.addValueChangeListener(e -> {
+				super.setValue((Date) e.getProperty().getValue());
+			});
+			resetDate = new Button();
+			resetDate.setIcon(FontAwesome.CALENDAR_CHECK_O);
+			resetDate.addClickListener(e -> {
+				property.setValue(new Date(System.currentTimeMillis()));
+			});
+			
+			setFocusDelegate(field);
+			
+			resetDate.setVisible(field.isVisible());
+			resetDate.setEnabled(field.isEnabled());
+			if(field.isReadOnly()){
+				resetDate.setEnabled(false);
+				resetDate.setVisible(false);
+			}
+			
+			HorizontalLayout layout = new HorizontalLayout(field, resetDate);
+			layout.setStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
+			return layout;
+		}
+		
+		public void setShowISOWeekNumber(boolean value) {
+			showISOWeekNumber = value;
+		}
+
+		void initField(){
+			field = new DateField();
+		}
+		
+		public void setResolution(Resolution res) {
+			field.setResolution(res);
+		}
+
+		public void setDateFormat(String dateFormat) {
+			field.setDateFormat(dateFormat);
+		}
+		
+		public void setPropertyDataSource(ObjectProperty<Date> property){
+			this.property = property;
+			field.setPropertyDataSource(property);
+		}
+
+		@Override
+		public Class<Date> getType() {
+			return Date.class;
+		}
+
+		@Override
+		protected void setInternalValue(Date newValue) {
+			super.setInternalValue(newValue);
+
+			if (property != null) {
+				property.setValue(newValue);
+			}
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
 		 * @see com.vaadin.ui.AbstractField#getErrorMessage()
 		 */
 		@Override
@@ -412,25 +496,30 @@
 	/**
 	 * The Class DefaultDateFormatProvider.
 	 */
-	private static class DefaultDateFormatProvider implements
-			IDateFormatProvider {
+	private static class DefaultDateFormatProvider implements IDateFormatProvider {
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.osbp.ecview.core.emf.api.IDateFormatProvider#getInfo(org.eclipse.osbp.ecview.core.extension.model.datatypes.YDateTimeDatatype, java.util.Locale)
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.osbp.ecview.core.emf.api.IDateFormatProvider#getInfo(org.
+		 * eclipse.osbp.ecview.core.extension.model.datatypes.YDateTimeDatatype,
+		 * java.util.Locale)
 		 */
 		@Override
 		public Info getInfo(YDateTimeDatatype yDt, Locale locale) {
-			
+
 			if (yDt == null) {
-	    		DateFormat formatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale);
-				return new IDateFormatProvider.Info(((SimpleDateFormat)formatter).toPattern(),
+				DateFormat formatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale);
+				return new IDateFormatProvider.Info(((SimpleDateFormat) formatter).toPattern(),
 						YDateTimeResolution.DAY);
 			}
 
-    		DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, locale);
-    		String pattern  = ((SimpleDateFormat)formatter).toPattern();
+			DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, locale);
+			String pattern = ((SimpleDateFormat) formatter).toPattern();
 
-    		String dateFormat = null;
+			String dateFormat = null;
+			String rightpattern = null;
 			YDateTimeResolution resolution = calcResolution(yDt);
 			YDateTimeFormat yFormat = yDt.getFormat();
 			if (yFormat != null) {
@@ -447,8 +536,7 @@
 						dateFormat = filterFormat(pattern, "yyyy.MM.dd");
 						break;
 					default:
-						throw new IllegalArgumentException(resolution
-								+ " is not a valid resolution for " + yFormat);
+						throw new IllegalArgumentException(resolution + " is not a valid resolution for " + yFormat);
 					}
 					break;
 				case DATE_TIME:
@@ -463,41 +551,44 @@
 						dateFormat = filterFormat(pattern, "yyyy.MM.dd");
 						break;
 					case HOUR:
-						dateFormat = filterFormat(pattern, "yyyy.MM.dd hhHH");
+						rightpattern = pattern.contains("a") ? "yyyy.MM.dd hhHH a" : "yyyy.MM.dd hhHH";
+						dateFormat = filterFormat(pattern, rightpattern);
 						break;
 					case MINUTE:
-						dateFormat = filterFormat(pattern, "yyyy.MM.dd hhHH:mm");
+						rightpattern = pattern.contains("a") ? "yyyy.MM.dd hhHH:mm a" : "yyyy.MM.dd hhHH:mm";
+						dateFormat = filterFormat(pattern, rightpattern);
 						break;
 					case SECOND:
-						dateFormat = filterFormat(pattern, "yyyy.MM.dd hhHH:mm:ss");
+						rightpattern = pattern.contains("a") ? "yyyy.MM.dd hhHH:mm:ss a" : "yyyy.MM.dd hhHH:mm:ss";
+						dateFormat = filterFormat(pattern, rightpattern);
 						break;
 					default:
-						throw new IllegalArgumentException(resolution
-								+ " is not a valid resolution for " + yFormat);
+						throw new IllegalArgumentException(resolution + " is not a valid resolution for " + yFormat);
 					}
 					break;
 				case TIME:
 					switch (resolution) {
 					case HOUR:
-						dateFormat = filterFormat(pattern, "HH");
+						rightpattern = pattern.contains("a") ? "hhHH a" : "hhHH";
+						dateFormat = filterFormat(pattern, rightpattern);
 						break;
 					case MINUTE:
-						dateFormat = filterFormat(pattern, "HH:mm");
+						rightpattern = pattern.contains("a") ? "hhHH:mm a" : "hhHH:mm";
+						dateFormat = filterFormat(pattern, rightpattern);
 						break;
 					case SECOND:
-						dateFormat = filterFormat(pattern, "HH:mm:ss");
+						rightpattern = pattern.contains("a") ? "hhHH:mm:ss a" : "hhHH:mm:ss";
+						dateFormat = filterFormat(pattern, rightpattern);
 						break;
 					default:
-						throw new IllegalArgumentException(resolution
-								+ " is not a valid resolution for " + yFormat);
+						throw new IllegalArgumentException(resolution + " is not a valid resolution for " + yFormat);
 					}
 					break;
 				}
 			}
-
 			return new IDateFormatProvider.Info(dateFormat, resolution);
 		}
-		
+
 		/**
 		 * filters from any localized date-time pattern the desired subset
 		 * defined by filterPattern without destroying the original localized
@@ -510,15 +601,24 @@
 		 * @return the string
 		 */
 		private String filterFormat(String localizedPattern, String filterPattern) {
-			// remove any multiple characters sequences and remove all separator signs from filterPattern 
-			String filter = filterPattern.replaceAll("(.)\\1+", "$1").replaceAll("[^\\w\\s]", "")+",";
-			// create a replacement pattern to remove unnecessary blanks disturbing the recognition of orphaned separators
-			// rule: each blank must be surrounded by any filter-letter to be valid
-			String invalidBlanks = "(?!["+filter+"])( )(?!["+filter+"])";
-			// create a replacement pattern to remove remaining separators without formatting function
-			// rule: each separator must be surrounded by any filter-letter or blank to be valid
-			String invalidSeparators = "(?!["+filter+" ])([.:])(?!["+filter+" ])";
-			return localizedPattern.replaceAll("[^"+filter+",.: ]", "").replaceAll(invalidBlanks, "").trim().replaceAll(invalidSeparators, "");
+			// remove any multiple characters sequences and remove all separator
+			// signs from filterPattern
+			String filter = filterPattern.replaceAll("(.)\\1+", "$1").replaceAll("[^\\w\\s]", "") + ",";
+			// create a replacement pattern to remove unnecessary blanks
+			// disturbing the recognition of orphaned separators
+			// rule: each blank must be surrounded by any filter-letter to be
+			// valid
+			String invalidBlanks = "(?![" + filter + "])( )(?![" + filter + "])";
+			// create a replacement pattern to remove remaining separators
+			// without formatting function
+			// rule: each separator must be surrounded by any filter-letter or
+			// blank to be valid
+			String invalidSeparators = "(?![" + filter + " ])([.:])(?![" + filter + " ])";
+			
+			String dateFormat = localizedPattern.replaceAll("[^" + filter + ",.: ]", "").replaceAll(invalidBlanks, "").trim()
+					.replaceAll(invalidSeparators, "");
+			if(dateFormat.startsWith(",") || dateFormat.startsWith(".")){ dateFormat = dateFormat.substring(1); }
+			return dateFormat;
 		}
 
 		/**
@@ -535,26 +635,20 @@
 				YDateTimeResolution yResolution = yDt.getResolution();
 				switch (yFormat) {
 				case DATE:
-					if (yResolution == YDateTimeResolution.UNDEFINED
-							|| yResolution == YDateTimeResolution.SECOND
-							|| yResolution == YDateTimeResolution.MINUTE
-							|| yResolution == YDateTimeResolution.HOUR) {
+					if (yResolution == YDateTimeResolution.UNDEFINED || yResolution == YDateTimeResolution.SECOND
+							|| yResolution == YDateTimeResolution.MINUTE || yResolution == YDateTimeResolution.HOUR) {
 						resolution = YDateTimeResolution.DAY;
 					}
 					break;
 				case DATE_TIME:
-					if (yResolution == YDateTimeResolution.UNDEFINED
-							|| yResolution == YDateTimeResolution.DAY
-							|| yResolution == YDateTimeResolution.MONTH
-							|| yResolution == YDateTimeResolution.YEAR) {
+					if (yResolution == YDateTimeResolution.UNDEFINED || yResolution == YDateTimeResolution.DAY
+							|| yResolution == YDateTimeResolution.MONTH || yResolution == YDateTimeResolution.YEAR) {
 						resolution = YDateTimeResolution.MINUTE;
 					}
 					break;
 				case TIME:
-					if (yResolution == YDateTimeResolution.UNDEFINED
-							|| yResolution == YDateTimeResolution.DAY
-							|| yResolution == YDateTimeResolution.MONTH
-							|| yResolution == YDateTimeResolution.YEAR) {
+					if (yResolution == YDateTimeResolution.UNDEFINED || yResolution == YDateTimeResolution.DAY
+							|| yResolution == YDateTimeResolution.MONTH || yResolution == YDateTimeResolution.YEAR) {
 						resolution = YDateTimeResolution.MINUTE;
 					}
 					break;
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DecimalFieldPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DecimalFieldPresentation.java
index 2b4ac1b..cca4cd3 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DecimalFieldPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DecimalFieldPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DialogPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DialogPresentation.java
index a2f5bff..ee91249 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DialogPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DialogPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -36,6 +38,7 @@
 import org.eclipse.osbp.ecview.core.util.emf.ModelUtil;
 import org.eclipse.osbp.runtime.common.dispose.AbstractDisposable;
 import org.eclipse.osbp.runtime.common.i18n.II18nService;
+import org.eclipse.osbp.runtime.common.session.ISession;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.IConstants;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.internal.util.Util;
 import org.eclipse.osbp.runtime.web.vaadin.databinding.VaadinObservables;
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumComboBoxPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumComboBoxPresentation.java
index 3994f1e..13036c9 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumComboBoxPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumComboBoxPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -11,6 +13,7 @@
 package org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.internal;
 
 import java.util.Locale;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -24,12 +27,11 @@
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IEnumComboBoxEditpart;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractFieldWidgetPresenter;
+import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.ClassLoaderResource;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.internal.data.EnumConverter;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.internal.data.EnumOptionBean;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.internal.data.EnumOptionBeanHelper;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.internal.util.Util;
-import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
-import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,6 +68,8 @@
 	@SuppressWarnings("rawtypes")
 	private ObjectProperty property;
 
+	private ClassLoader enumTypeLoader;
+
 	/**
 	 * Constructor.
 	 * 
@@ -102,6 +106,8 @@
 				property = new ObjectProperty(null, modelAccess.yField.getType());
 				combo.setPropertyDataSource(property);
 
+				enumTypeLoader = modelAccess.yField.getType().getClassLoader();
+				
 				if (modelAccess.yField.getType() != null) {
 					BeanItemContainer<EnumOptionBean> datasource = createDatasource(
 							(Class<? extends Enum<?>>) modelAccess.yField.getType());
@@ -464,9 +470,14 @@
 				final Object icon = ip.getValue();
 				try {
 					if (icon instanceof String) {
-						IThemeResourceService themeResourceService = getViewContext()
-								.getService(IThemeResourceService.class.getName());
-						return themeResourceService.getThemeResource((String) icon, ThemeResourceType.ICON);
+						String[] parts = ((String) icon).split(Pattern.quote("."));
+						StringBuilder iconPath = new StringBuilder();
+						iconPath.append("enums/");
+						iconPath.append(parts[0]);
+						iconPath.append("/");
+						iconPath.append(parts[1].toLowerCase());
+						iconPath.append(".png");
+						return new ClassLoaderResource(enumTypeLoader, iconPath.toString());
 					}
 				} catch (Exception e) {
 					LOGGER.debug(e.getLocalizedMessage());
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumListPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumListPresentation.java
index ce0db66..4f02233 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumListPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumListPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumOptionsGroupPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumOptionsGroupPresentation.java
index a52ead5..6678214 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumOptionsGroupPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/EnumOptionsGroupPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FilteringComponentPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FilteringComponentPresentation.java
index f0dd3bb..fba4eb0 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FilteringComponentPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FilteringComponentPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FormLayoutPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FormLayoutPresentation.java
index 37fbafb..5907f7e 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FormLayoutPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/FormLayoutPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/GridLayoutPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/GridLayoutPresentation.java
index 0fc1734..ba78cec 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/GridLayoutPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/GridLayoutPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/HorizontalLayoutPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/HorizontalLayoutPresentation.java
index f94f8a5..2e63a1b 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/HorizontalLayoutPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/HorizontalLayoutPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ImagePresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ImagePresentation.java
index 233aee1..f564979 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ImagePresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ImagePresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/KanbanPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/KanbanPresentation.java
index 585bffb..e982c5d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/KanbanPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/KanbanPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/LabelPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/LabelPresentation.java
index 555621f..9fa23ca 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/LabelPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/LabelPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ListPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ListPresentation.java
index ac7eca4..fa7bcb2 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ListPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ListPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/MasterDetailPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/MasterDetailPresentation.java
index eaf5488..2158bb6 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/MasterDetailPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/MasterDetailPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericFieldPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericFieldPresentation.java
index d5511b1..7ef9a7d 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericFieldPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericFieldPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericSearchFieldPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericSearchFieldPresentation.java
index 79025dd..a6b2e39 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericSearchFieldPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/NumericSearchFieldPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/OptionsGroupPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/OptionsGroupPresentation.java
index da46582..e62dbf7 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/OptionsGroupPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/OptionsGroupPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PanelPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PanelPresentation.java
index a0d12bd..876b272 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PanelPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PanelPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
@@ -13,9 +15,16 @@
 import java.util.ArrayList;
 import java.util.Locale;
 
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.osbp.ecview.core.common.editpart.IElementEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.IEmbeddableEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.ILayoutEditpart;
+import org.eclipse.osbp.ecview.core.common.model.core.YField;
+import org.eclipse.osbp.ecview.core.common.model.core.YFocusable;
+import org.eclipse.osbp.ecview.core.common.model.core.YView;
+import org.eclipse.osbp.ecview.core.common.services.IWidgetAssocationsService;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YPanel;
 import org.eclipse.osbp.runtime.designer.api.IDesignerService.DesignEvent;
 import org.eclipse.osbp.runtime.web.ecview.presentation.vaadin.common.AbstractLayoutPresenter;
@@ -23,22 +32,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Panel;
+import com.vaadin.ui.UI;
 
 /**
  * This presenter is responsible to render a text field on the given layout.
  */
 public class PanelPresentation extends AbstractLayoutPresenter<Component> {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PanelPresentation.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(PanelPresentation.class);
 
 	private Panel panel;
 	private ModelAccess modelAccess;
 
-	// private CssLayout fillerLayout;
-
 	/**
 	 * The constructor.
 	 * 
@@ -63,8 +71,7 @@
 	 * Applies the labels to the widgets.
 	 */
 	protected void applyCaptions() {
-		Util.applyCaptions(getI18nService(), modelAccess.getLabel(),
-				modelAccess.getLabelI18nKey(), getLocale(), panel);
+		Util.applyCaptions(getI18nService(), modelAccess.getLabel(), modelAccess.getLabelI18nKey(), getLocale(), panel);
 	}
 
 	/**
@@ -86,7 +93,24 @@
 		if (panel == null) {
 
 			panel = new Panel();
+			
 			setupComponent(panel, getCastedModel());
+			
+			if(parent instanceof AbstractOrderedLayout) {
+				((AbstractOrderedLayout)parent).addLayoutClickListener(e->{
+					YField clickedField = null;
+					Component clickedComponent = e.getClickedComponent();
+					IWidgetAssocationsService<Component, EObject> service = getViewContext().getService(IWidgetAssocationsService.ID);
+					EObject element = service.getModelElement(clickedComponent);
+					if(element instanceof YField) {
+						clickedField = (YField) element;
+						focusFirstField(clickedField);
+					}
+					if(element instanceof YPanel && panel.equals(clickedComponent)) {
+						focusFirstField(null);
+					}
+				});
+			}
 
 			associateWidget(panel, modelAccess.yLayout);
 			if (modelAccess.isCssIdValid()) {
@@ -117,6 +141,24 @@
 		return panel;
 	}
 
+	private void focusFirstField(YField clickedField) {
+		TreeIterator<EObject> iter = EcoreUtil.getAllContents(modelAccess.yLayout, false);
+		while (iter.hasNext()) {
+			EObject element = iter.next();
+			if (element instanceof YFocusable) {
+				UI ui = panel.getUI();
+				// either find first field focusable or the clicked field if not null
+				if(clickedField == null || clickedField.equals(element)) {
+					ui.access(() -> {
+						YView view = (YView) getViewContext().getViewEditpart().getModel();
+						view.setCurrentFocus((YFocusable) element);
+					});
+					break;
+				}
+			}
+		}
+	}
+
 	/**
 	 * Adds the children to the superclass and prevents rendering.
 	 */
@@ -158,8 +200,7 @@
 	@Override
 	protected void internalDispose() {
 		try {
-			for (IEmbeddableEditpart child : new ArrayList<IEmbeddableEditpart>(
-					getChildren())) {
+			for (IEmbeddableEditpart child : new ArrayList<IEmbeddableEditpart>(getChildren())) {
 				child.dispose();
 			}
 			unrender();
@@ -181,14 +222,15 @@
 		}
 
 		if (index == 0) {
-			panel.setContent((Component) editpart.render(panel));
+			Component child = (Component) editpart.render(panel);
+			child.setSizeFull();
+			panel.setContent(child);
 		}
 	}
 
 	@Override
 	protected void internalRemove(IEmbeddableEditpart child) {
-		if (panel != null && child.isRendered()
-				&& panel.getContent() == child.getWidget()) {
+		if (panel != null && child.isRendered() && panel.getContent() == child.getWidget()) {
 			panel.setContent(null);
 		}
 
@@ -201,8 +243,7 @@
 	}
 
 	@Override
-	protected void internalMove(IEmbeddableEditpart editpart, int oldIndex,
-			int newIndex) {
+	protected void internalMove(IEmbeddableEditpart editpart, int oldIndex, int newIndex) {
 		refreshUI();
 	}
 
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PasswordFieldPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PasswordFieldPresentation.java
index 46e2e59..4f55c56 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PasswordFieldPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PasswordFieldPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011 - 2015, Lunifera GmbH (Gross Enzersdorf), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PresenterFactory.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PresenterFactory.java
index 71e4971..786ed15 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PresenterFactory.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/PresenterFactory.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ProgressBarPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ProgressBarPresentation.java
index 81dfe0c..f720323 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ProgressBarPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/ProgressBarPresentation.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), 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:
  *         Florian Pirchner - Initial implementation
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/SearchPanelPresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/SearchPanelPresentation.java
index 7988f2f..4a540ad 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/SearchPanelPresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/SearchPanelPresentation.java
@@ -1,9 +1,11 @@
 /**