Updated licence to EPL2.0 and added CONTRIBUTING etc. files
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..5138510
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,55 @@
+# Contributing to Eclipse emfatic
+
+Thanks for your interest in this project.
+
+## Project description
+
+A textual syntax for EMF Ecore (meta-)models.
+
+* https://projects.eclipse.org/projects/modeling.emft.emfatic
+
+## Developer resources
+
+Information regarding source code management, builds, coding standards, and
+more.
+
+* https://projects.eclipse.org/projects/modeling.emft.emfatic/developer
+
+The project maintains the following source code repositories
+
+* https://git.eclipse.org/r/plugins/gitiles/emfatic/org.eclipse.emfatic
+
+This project uses Bugzilla to track ongoing development and issues.
+
+* Search for issues: https://bugs.eclipse.org/bugs/buglist.cgi?product=EMFT
+* Create a new report: https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EMFT
+
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
+
+## Eclipse Development Process
+
+This Eclipse Foundation open project is governed by the Eclipse Foundation
+Development Process and operates under the terms of the Eclipse IP Policy.
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* http://www.eclipse.org/legal/ECA.php
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* https://dev.eclipse.org/mailman/listinfo/emft-dev
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e23ece2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+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, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+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. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..07a5625
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,52 @@
+# Notices for Eclipse emfatic
+
+This content is produced and maintained by the Eclipse emfatic project.
+
+* Project home: https://projects.eclipse.org/projects/modeling.emft.emfatic
+
+## Trademarks
+
+ Eclipse emfatic is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+https://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* https://git.eclipse.org/r/plugins/gitiles/emfatic/org.eclipse.emfatic
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ANTLR runtime (3.0)
+
+* License: New BSD license
+
+JavaCC from CVS (20070207) (4.0)
+
+* License: New BSD license
+* Source:
+   http://ftp.debian.org/debian/pool/main/j/javacc/javacc_4.0+cvs20070207.orig.tar.gz
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfatic.core/plugin.properties b/bundles/org.eclipse.emf.emfatic.core/plugin.properties
index 0cd752c..6c48455 100644
--- a/bundles/org.eclipse.emf.emfatic.core/plugin.properties
+++ b/bundles/org.eclipse.emf.emfatic.core/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2001, 2004 IBM Corporation 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 v2.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/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -13,9 +13,9 @@
 # *
 # * Copyright (c) 2004,2006 IBM Corporation 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 v2.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/
 # * 
 # * Contributors: 
 # *   IBM - Initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/EmfaticCorePlugin.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/EmfaticCorePlugin.java
index 0e2d310..ddc3fd7 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/EmfaticCorePlugin.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/EmfaticCorePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Builder.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Builder.java
index e3c71d6..21e5555 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Builder.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Builder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Connector.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Connector.java
index 6d4d525..4eb95be 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Connector.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/Connector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EcoreGenerator.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EcoreGenerator.java
index 6a5ed4f..c094289 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EcoreGenerator.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EcoreGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticError.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticError.java
index c62ca55..b7fa6c9 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticError.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticError.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticWarning.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticWarning.java
index 3166b97..b785958 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticWarning.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/EmfaticSemanticWarning.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/GenerationPhase.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/GenerationPhase.java
index 4a99d60..a2452b5 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/GenerationPhase.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/GenerationPhase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2008 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenText.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenText.java
index b121f91..48f05cd 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenText.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenText.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenTextBlankSep.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenTextBlankSep.java
index 7b1ef64..b45efde 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenTextBlankSep.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/ecore/TokenTextBlankSep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/EmfaticGenerator.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/EmfaticGenerator.java
index c127458..a90fc34 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/EmfaticGenerator.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/EmfaticGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/Writer.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/Writer.java
index 5301ce5..85a5c92 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/Writer.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generator/emfatic/Writer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/BiMultiMap.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/BiMultiMap.java
index fccf583..6d9c3cc 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/BiMultiMap.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/BiMultiMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/EcoreWalker.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/EcoreWalker.java
index 3f6dccb..ed7f8f8 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/EcoreWalker.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/EcoreWalker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/GenericsUtil.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/GenericsUtil.java
index ecdb07d..497e81b 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/GenericsUtil.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/GenericsUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToManyMap.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToManyMap.java
index 280ae7c..9ea1c04 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToManyMap.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToManyMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToOneMap.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToOneMap.java
index 5ec1e63..a8da973 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToOneMap.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/generics/util/OneToOneMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticAnnotationMap.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticAnnotationMap.java
index 5f1171f..9e583b4 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticAnnotationMap.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticAnnotationMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticBasicTypes.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticBasicTypes.java
index da3224a..8aa2e5d 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticBasicTypes.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticBasicTypes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticKeywords.java b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticKeywords.java
index 822ef2a..befe7e1 100644
--- a/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticKeywords.java
+++ b/bundles/org.eclipse.emf.emfatic.core/src/org/eclipse/emf/emfatic/core/util/EmfaticKeywords.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2008 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.doc.user/html/about.html b/bundles/org.eclipse.emf.emfatic.doc.user/html/about.html
index 953f45c..0e5e52a 100644
--- a/bundles/org.eclipse.emf.emfatic.doc.user/html/about.html
+++ b/bundles/org.eclipse.emf.emfatic.doc.user/html/about.html
@@ -18,7 +18,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/org.eclipse.emf.emfatic.ui/plugin.properties b/bundles/org.eclipse.emf.emfatic.ui/plugin.properties
index 52feb87..bd0afff 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/plugin.properties
+++ b/bundles/org.eclipse.emf.emfatic.ui/plugin.properties
@@ -3,9 +3,9 @@
 # *
 # * Copyright (c) 2004,2006 IBM Corporation 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 v2.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/
 # * 
 # * Contributors: 
 # *   IBM - Initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/EmfaticUIPlugin.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/EmfaticUIPlugin.java
index 00b1de5..59000f2 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/EmfaticUIPlugin.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/EmfaticUIPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2008 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEcore.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEcore.java
index c8c87fa..e44c478 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEcore.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEcore.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEmfatic.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEmfatic.java
index b78c999..f1b7bb2 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEmfatic.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/actions/GenerateEmfatic.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/CascadedContentAssistProcessor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/CascadedContentAssistProcessor.java
index b50199d..48c9314 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/CascadedContentAssistProcessor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/CascadedContentAssistProcessor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticContentAssistProcessor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticContentAssistProcessor.java
index da46832..54d8170 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticContentAssistProcessor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticContentAssistProcessor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticKeywordContentAssistProcessor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticKeywordContentAssistProcessor.java
index 444be33..8817b96 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticKeywordContentAssistProcessor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/EmfaticKeywordContentAssistProcessor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/ProposalsComparator.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/ProposalsComparator.java
index 139a966..ad0eaa9 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/ProposalsComparator.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/ProposalsComparator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/WordPartDetector.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/WordPartDetector.java
index 71c1042..61b9f83 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/WordPartDetector.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/contentassist/WordPartDetector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticAutoEditStrategy.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticAutoEditStrategy.java
index 04ef0a6..ab9ab5f 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticAutoEditStrategy.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticAutoEditStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticCodeScanner.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticCodeScanner.java
index 1187dba..33562cb 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticCodeScanner.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticCodeScanner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditor.java
index eabaf63..f109120 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorActionContributor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorActionContributor.java
index 8ea2708..3a3ea1e 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorActionContributor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorActionContributor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorMessages.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorMessages.java
index b1019cb..ad864c2 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorMessages.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorSelectionListener.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorSelectionListener.java
index 1c1d4dc..1dab275 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorSelectionListener.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticEditorSelectionListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticKeyListener.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticKeyListener.java
index 5377bf2..0ae83c4 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticKeyListener.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticKeyListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticOutlineConfiguration.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticOutlineConfiguration.java
index dc8c91c..d1fa066 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticOutlineConfiguration.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticOutlineConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticSourceViewerConfiguration.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticSourceViewerConfiguration.java
index 3071419..6869f15 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticSourceViewerConfiguration.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticSourceViewerConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticTextHover.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticTextHover.java
index cc38495..5df92d7 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticTextHover.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/EmfaticTextHover.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.java
index 19e1f19..7b306ad 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.properties b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.properties
index 31501e5..756adbc 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.properties
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/EmfaticEditorActionMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2006 IBM Corporation 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 v2.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/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/OpenDeclarationAction.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/OpenDeclarationAction.java
index 69bdf20..d7fcfd2 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/OpenDeclarationAction.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/editor/actions/OpenDeclarationAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlink.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlink.java
index 51d0e93..cf56dac 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlink.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlink.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlinkDetector.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlinkDetector.java
index ae1611e..805d5f0 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlinkDetector.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/hyperlinks/EmfaticHyperlinkDetector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnFilterAction.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnFilterAction.java
index 1d30641..c8979b9 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnFilterAction.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnFilterAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnotationFilter.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnotationFilter.java
index f070cad..555b185 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnotationFilter.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AnnotationFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilter.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilter.java
index 0399b6d..3338d7e 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilter.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilterAction.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilterAction.java
index 323a08a..94f4d78 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilterAction.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/AttrFilterAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/EmfaticContentOutlinePage.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/EmfaticContentOutlinePage.java
index c8360d3..23ab060 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/EmfaticContentOutlinePage.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/EmfaticContentOutlinePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilter.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilter.java
index f34899b..34fddd6 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilter.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilterAction.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilterAction.java
index 188b826..9c80c09 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilterAction.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/OpFilterAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilter.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilter.java
index 6c7fa3b..037dedc 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilter.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilterAction.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilterAction.java
index a1446d3..e92603c 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilterAction.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/RefFilterAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilter.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilter.java
index 1be6939..7e0ef42 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilter.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilterAction.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilterAction.java
index cf2c89a..af872b6 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilterAction.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/outline/TypeParamFilterAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/DebugPartitioner.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/DebugPartitioner.java
index 69288a4..f772303 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/DebugPartitioner.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/DebugPartitioner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticDocumentProvider.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticDocumentProvider.java
index abd3ea7..cd8b25b 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticDocumentProvider.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticPartitionScanner.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticPartitionScanner.java
index 779b152..5a74b0d 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticPartitionScanner.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/EmfaticPartitionScanner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLAnnotationHover.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLAnnotationHover.java
index 5760636..bef048e 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLAnnotationHover.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLAnnotationHover.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation 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 v2.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/
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLPrinter.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLPrinter.java
index f2ac1e6..a1c1060 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLPrinter.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/HTMLPrinter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/NonMatchingRule.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/NonMatchingRule.java
index 75029a1..3d18451 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/NonMatchingRule.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/partition/NonMatchingRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticPreferencePage.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticPreferencePage.java
index ba82c2e..fcc9928 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticPreferencePage.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticTemplatesPreferencePage.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticTemplatesPreferencePage.java
index 60f122f..ed80689 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticTemplatesPreferencePage.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/EmfaticTemplatesPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceConstants.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceConstants.java
index 0b6c15c..a5d7301 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceConstants.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceInitializer.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceInitializer.java
index f929671..90a3e9f 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceInitializer.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/preferences/PreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticCSTChangeListener.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticCSTChangeListener.java
index b3bba92..0b798e8 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticCSTChangeListener.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticCSTChangeListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquiggler.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquiggler.java
index 133bdd4..11e896a 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquiggler.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquiggler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquigglerDeltaVisitor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquigglerDeltaVisitor.java
index c32127a..9f985f3 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquigglerDeltaVisitor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/redsquiggles/EmfaticRedSquigglerDeltaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticContextType.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticContextType.java
index 92cb51d..7eeac63 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticContextType.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticContextType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticTemplateCompletionProcessor.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticTemplateCompletionProcessor.java
index 0f308f6..9a99a83 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticTemplateCompletionProcessor.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/templates/EmfaticTemplateCompletionProcessor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/EmfaticOutlineBuilder.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/EmfaticOutlineBuilder.java
index b9757f8..d02b214 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/EmfaticOutlineBuilder.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/EmfaticOutlineBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewContentProvider.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewContentProvider.java
index 6442aee..891c592 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewContentProvider.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewLabelProvider.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewLabelProvider.java
index 11be656..b4ad422 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewLabelProvider.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/MethodsViewLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.java
index 57d7a1d..500e3c6 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2006 IBM Corporation 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 v2.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/
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.properties b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.properties
index cdf4406..e1e4507 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.properties
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypeHierarchyMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2000, 2006 IBM Corporation 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 v2.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/
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesView.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesView.java
index d38a2da..623ff95 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesView.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewContentProvider.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewContentProvider.java
index f27efba..7a55031 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewContentProvider.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewDoubleClick.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewDoubleClick.java
index c09d370..7016e04 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewDoubleClick.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewDoubleClick.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewLabelProvider.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewLabelProvider.java
index 8ebc7ed..b1122a3 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewLabelProvider.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/views/TypesViewLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewFileCreationPage.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewFileCreationPage.java
index 2876a64..0b16b80 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewFileCreationPage.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewFileCreationPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewWizard.java b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewWizard.java
index 54ff69b..541dfe4 100644
--- a/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewWizard.java
+++ b/bundles/org.eclipse.emf.emfatic.ui/src/org/eclipse/emf/emfatic/ui/wizards/EmfaticNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     Miguel Garcia (Tech Univ Hamburg-Harburg) - customization for EMF Generics
diff --git a/bundles/org.eclipse.gymnast.runtime.core/plugin.properties b/bundles/org.eclipse.gymnast.runtime.core/plugin.properties
index 23d2235..a2a1f29 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/plugin.properties
+++ b/bundles/org.eclipse.gymnast.runtime.core/plugin.properties
@@ -3,9 +3,9 @@
 # *
 # * Copyright (c) 2004,2006 IBM Corporation 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 v2.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/
 # * 
 # * Contributors: 
 # *   IBM - Initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/LDTCorePlugin.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/LDTCorePlugin.java
index 187e541..e3ee9da 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/LDTCorePlugin.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/LDTCorePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNode.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNode.java
index c620c97..9344aad 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNode.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNodeImpl.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNodeImpl.java
index a3e58fb..46346d7 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNodeImpl.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/ASTNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNode.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNode.java
index cea0086..41c64f2 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNode.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNodeImpl.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNodeImpl.java
index 97c765e..dac9172 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNodeImpl.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/OutlineNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/PropertySourceNodeImpl.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/PropertySourceNodeImpl.java
index 9e022cb..b3d4772 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/PropertySourceNodeImpl.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/ast/PropertySourceNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/IOutlineBuilder.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/IOutlineBuilder.java
index 08709d3..607946e 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/IOutlineBuilder.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/IOutlineBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/OutlineNode.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/OutlineNode.java
index 61bc5f7..ea53578 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/OutlineNode.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/outline/OutlineNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/IParser.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/IParser.java
index 4a8f10d..60f0908 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/IParser.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/IParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseContext.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseContext.java
index c3de172..6a39547 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseContext.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseError.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseError.java
index e772eea..090d6ad 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseError.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseError.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseMessage.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseMessage.java
index 7281a1f..031715e 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseMessage.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseMessage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseWarning.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseWarning.java
index 4c9a135..c3b4ba2 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseWarning.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/parser/ParseWarning.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContext.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContext.java
index 338e35d..552a8f3 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContext.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContextType.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContextType.java
index 813eac1..6a603bd 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContextType.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateContextType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateTranslator.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateTranslator.java
index 593e26b..6b59050 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateTranslator.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateTranslator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariable.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariable.java
index a5f91a6..7170219 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariable.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariableResolver.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariableResolver.java
index bb0d40c..d288150 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariableResolver.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/templates/ext/ExtTemplateVariableResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/IReporter.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/IReporter.java
index 97eb20d..2e0e080 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/IReporter.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/IReporter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/MarkerUtil.java b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/MarkerUtil.java
index f96e216..4caa421 100644
--- a/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/MarkerUtil.java
+++ b/bundles/org.eclipse.gymnast.runtime.core/src/org/eclipse/gymnast/runtime/core/util/MarkerUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/plugin.properties b/bundles/org.eclipse.gymnast.runtime.ui/plugin.properties
index 18479f9..df0d11d 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/plugin.properties
+++ b/bundles/org.eclipse.gymnast.runtime.ui/plugin.properties
@@ -3,9 +3,9 @@
 # *
 # * Copyright (c) 2004,2006 IBM Corporation 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 v2.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/
 # * 
 # * Contributors: 
 # *   IBM - Initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/LDTUIPlugin.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/LDTUIPlugin.java
index a50aed5..57d267a 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/LDTUIPlugin.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/LDTUIPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/actions/FindInParseTreeView.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/actions/FindInParseTreeView.java
index e18c4ee..a035558 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/actions/FindInParseTreeView.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/actions/FindInParseTreeView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTCodeScanner.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTCodeScanner.java
index 6e757a7..bc4c063 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTCodeScanner.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTCodeScanner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditor.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditor.java
index ad4aa64..33dd314 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditor.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditorActionContributor.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditorActionContributor.java
index 06f4d52..eec6e0f 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditorActionContributor.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTEditorActionContributor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTReconcilingStrategy.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTReconcilingStrategy.java
index cde8e22..cd2112b 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTReconcilingStrategy.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTReconcilingStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTSourceViewerConfiguration.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTSourceViewerConfiguration.java
index 653697d..6361e47 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTSourceViewerConfiguration.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/editor/LDTSourceViewerConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTContentOutlinePage.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTContentOutlinePage.java
index e66908a..e7b8e74 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTContentOutlinePage.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTContentOutlinePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineConfiguration.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineConfiguration.java
index be9a1a4..60dc636 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineConfiguration.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineContentProvider.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineContentProvider.java
index b70200b..78a56e6 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineContentProvider.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineLabelProvider.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineLabelProvider.java
index aa58ef9..3be60c2 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineLabelProvider.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/outline/LDTOutlineLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/preferences/LDTMainPreferencePage.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/preferences/LDTMainPreferencePage.java
index f0d44c2..a3c2274 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/preferences/LDTMainPreferencePage.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/preferences/LDTMainPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/util/LDTColorProvider.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/util/LDTColorProvider.java
index a363f94..d19c3ad 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/util/LDTColorProvider.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/util/LDTColorProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/console/ReporterConsole.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/console/ReporterConsole.java
index 99169dc..1915f3e 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/console/ReporterConsole.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/console/ReporterConsole.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeChangedListener.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeChangedListener.java
index 99e189d..c3fc241 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeChangedListener.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeChangedListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeViewInput.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeViewInput.java
index 44b0ea4..fc13f01 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeViewInput.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/IParseTreeViewInput.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeLabelProvider.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeLabelProvider.java
index 3f88835..b46c841 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeLabelProvider.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeView.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeView.java
index 9fd8b5d..908ddaa 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeView.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeViewerContentProvider.java b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeViewerContentProvider.java
index a84b10c..59f854f 100644
--- a/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeViewerContentProvider.java
+++ b/bundles/org.eclipse.gymnast.runtime.ui/src/org/eclipse/gymnast/runtime/ui/views/parsetree/ParseTreeViewerContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2006 IBM Corporation 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 v2.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/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.emf.emfatic-feature/feature.xml b/features/org.eclipse.emf.emfatic-feature/feature.xml
index 8bdd776..e1a90fb 100644
--- a/features/org.eclipse.emf.emfatic-feature/feature.xml
+++ b/features/org.eclipse.emf.emfatic-feature/feature.xml
@@ -17,84 +17,291 @@
 any .ecore file and choose Generate Emfatic source, a similar
 converter works in the opposite direction.  Online help is also
 available.  
-Emfatic is hosted as an EMFT component with Incubation status.
+Emfatic is hosted as an EMFT component.
    </description>
 
    <copyright>
       Copyright (c) 2006 IBM Corporation and others.
    </copyright>
 
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      Eclipse Public License - v 1.0
+   <license url="https://www.eclipse.org/legal/epl-2.0/">
+      Eclipse Public License - v 2.0
 
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
 
 1. DEFINITIONS
 
 &quot;Contribution&quot; means:
 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;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.
-&quot;Contributor&quot; means any person or entity that distributes the Program.
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
 
-&quot;Licensed Patents &quot; 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.
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  &quot;originates&quot; from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor&apos;s behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
 
-&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+&quot;Contributor&quot; means any person or entity that Distributes the Program.
 
-&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+&quot;Licensed Patents&quot; 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.
+
+&quot;Program&quot; means the Contributions Distributed in accordance with this
+Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+&quot;Derivative Works&quot; shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+&quot;Modified Works&quot; shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+&quot;Distribute&quot; means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+&quot;Source Code&quot; means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+&quot;Secondary License&quot; means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
 
 2. GRANT OF RIGHTS
 
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+  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.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  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&apos;s responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient&apos;s
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
 3. REQUIREMENTS
 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+3.1 If a Contributor Distributes the Program in any form, then:
 
-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) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
 
-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.
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
 
-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.
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients&apos; rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability (&quot;notices&quot;) contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
 
 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 (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) 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.
+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
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every
+other Contributor (&quot;Indemnified Contributor&quot;) against any losses,
+damages and costs (collectively &quot;Losses&quot;) 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&apos;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.
+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&apos;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 &quot;AS IS&quot; 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.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot;
+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.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
 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 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&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+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&apos;s patent(s), then such Recipient&apos;s
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
 
-All Recipient&apos;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&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+All Recipient&apos;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&apos;s
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient&apos;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.
+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.
 
-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.
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+&quot;This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}.&quot;
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
    </license>
 
    <requires>
diff --git a/updatesites/org.eclipse.emf.emfatic.updatesite/readme.txt b/updatesites/org.eclipse.emf.emfatic.updatesite/readme.txt
new file mode 100644
index 0000000..4eabf49
--- /dev/null
+++ b/updatesites/org.eclipse.emf.emfatic.updatesite/readme.txt
@@ -0,0 +1,3 @@
+- Rebuild update site in 2019-09
+- Run build.xml
+- Upload to build.eclipse.org
\ No newline at end of file