Upgrade license from CPLv1/EPLv1 to EPLv2

This was required by the Eclipse team as one precondition for the next
release.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

5 files changed, 44 insertions, 34 deletions

diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java
index c69ae7121..6b2624c31 100644
--- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java
+++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/annotation/View.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009 Collaborative Development Group, C.S. Dept., University of Bari
  *
- * All rights reserved. This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License v1.0  which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  */
 package it.uniba.di.cdg.penelope.ui.annotation;
 
diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj
index 80dd4650d..bd166f04d 100644
--- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj
+++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/AbstractViewEnhancerAspect.aj
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009  Collaborative Development Group, C.S. Dept., University of Bari
  *
- * All rights reserved. This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License v1.0  which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  */
 package it.uniba.di.cdg.penelope.ui.mvp;
 
@@ -16,23 +18,23 @@ import java.util.List;
  * Augments views with support for View events.
  */
 public abstract aspect AbstractViewEnhancerAspect {
-	pointcut scope(); 
-	
+	pointcut scope();
+
 	declare parents: (@View *) implements IManagedView;
 
-	private final List<IPresenter> IManagedView.presenters = new ArrayList<IPresenter>(); 
-	
+	private final List<IPresenter> IManagedView.presenters = new ArrayList<IPresenter>();
+
 	public void IManagedView.fire( Object event ) {
 		for (IPresenter presenter : presenters) {
 			presenter.dispatchEvent( event );
 		}
 	}
-	
+
 	public void IManagedView.registerPresenter( IPresenter presenter ) {
 		presenters.add( presenter );
 	}
-	
+
 	public void IManagedView.unregisterPresenter( IPresenter presenter ) {
 		presenters.remove( presenter );
-	}	
+	}
 }
diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java
index 7be156875..8479dfed2 100644
--- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java
+++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IManagedView.java
@@ -1,19 +1,21 @@
 /**
  * Copyright (c) 2009  Collaborative Development Group, C.S. Dept., University of Bari
  *
- * All rights reserved. This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License v1.0  which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  */
 package it.uniba.di.cdg.penelope.ui.mvp;
 
 /**
- * 
+ *
  */
 public interface IManagedView {
 	void fire( Object event );
-	
+
 	void registerPresenter( IPresenter presenter );
-	
+
 	void unregisterPresenter( IPresenter presenter );
 }
diff --git a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java
index 6cdb46dfb..1a7add898 100644
--- a/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java
+++ b/tests/multiIncremental/pr298704_baseaspects/base/src/it/uniba/di/cdg/penelope/ui/mvp/IPresenter.java
@@ -1,16 +1,18 @@
 /**
  * Copyright (c) 2009  Collaborative Development Group, C.S. Dept., University of Bari
  *
- * All rights reserved. This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License v1.0  which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  */
 package it.uniba.di.cdg.penelope.ui.mvp;
 
 import java.beans.PropertyChangeListener;
 
 /**
- * Basic interface for <strong>Presenter</strong> implementations. Within Penelope, a Presenter is a supervising controller 
+ * Basic interface for <strong>Presenter</strong> implementations. Within Penelope, a Presenter is a supervising controller
  * which reacts to view events (see the View Events mechanism): the view just displays the session state stored within
  * the <strong>Presentation Model</strong>.
  */
@@ -18,7 +20,7 @@ public interface IPresenter extends PropertyChangeListener {
 	/**
 	 * View has been created.
 	 */
-	void onViewCreated(); 
+	void onViewCreated();
 
 	/**
 	 * View has been destroyed.
diff --git a/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java b/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java
index a10ddd060..74425dee2 100644
--- a/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java
+++ b/tests/multiIncremental/pr298704_testaspects/base/src/test/ViewEnhancerIntegrationTest.java
@@ -1,9 +1,11 @@
 /**
  * Copyright (c) 2009  Collaborative Development Group, C.S. Dept., University of Bari
  *
- * All rights reserved. This program and the accompanying materials are made available under
- * the terms of the Eclipse Public License v1.0  which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  */
 package test;
 
@@ -12,28 +14,28 @@ import it.uniba.di.cdg.penelope.ui.mvp.IManagedView;
 import it.uniba.di.cdg.penelope.ui.mvp.AbstractViewEnhancerAspect;
 
 /**
- * 
+ *
  */
 public class ViewEnhancerIntegrationTest {
 
 @View
 	public static class MockView {
-		
+
 	}
-	
+
 	static aspect ViewEnhancerAspect extends AbstractViewEnhancerAspect {
 		pointcut scope() : within( test.ViewEnhancerIntegrationTest );
 	}
-	
+
 	public void simulateViewCreation() {
 	}
-	
+
 	public void shouldAugmentView() {
 		//given @View class has been augmented
 
 		//when
-		MockView view = new MockView(); 
-		
+		MockView view = new MockView();
+
 		//then
 	//	assertTrue( view instanceof IManagedView );
 	}