aboutsummaryrefslogtreecommitdiffstats
path: root/testing-client
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-06-04 07:58:52 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-06-04 07:58:52 +0700
commit49cb924f5402c9d24379ae1af62def6fa5892649 (patch)
tree69844405209043e2e18aa9eef0f01f287bc1ae52 /testing-client
parent82df3f0fc9842758f15f12299c9113e48f1ccb5c (diff)
downloadaspectj-49cb924f5402c9d24379ae1af62def6fa5892649.tar.gz
aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.zip
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>
Diffstat (limited to 'testing-client')
-rw-r--r--testing-client/src/main/java/org/aspectj/testing/Tester.java4
-rw-r--r--testing-client/src/main/java/org/aspectj/testing/server/TestServer.java4
-rw-r--r--testing-client/src/test/java/org/aspectj/testing/TesterTest.java4
-rw-r--r--testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java26
-rw-r--r--testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java10
5 files changed, 24 insertions, 24 deletions
diff --git a/testing-client/src/main/java/org/aspectj/testing/Tester.java b/testing-client/src/main/java/org/aspectj/testing/Tester.java
index 8e6e98db4..43524ef39 100644
--- a/testing-client/src/main/java/org/aspectj/testing/Tester.java
+++ b/testing-client/src/main/java/org/aspectj/testing/Tester.java
@@ -2,9 +2,9 @@
* Copyright (c) 1999-2000 Xerox Corporation.
* All rights reserved.
* This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
* which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
*
* Contributors:
* Xerox/PARC initial implementation
diff --git a/testing-client/src/main/java/org/aspectj/testing/server/TestServer.java b/testing-client/src/main/java/org/aspectj/testing/server/TestServer.java
index 25a1ad464..9e7710b0e 100644
--- a/testing-client/src/main/java/org/aspectj/testing/server/TestServer.java
+++ b/testing-client/src/main/java/org/aspectj/testing/server/TestServer.java
@@ -1,9 +1,9 @@
/*******************************************************************************
* Copyright (c) 2006,2017 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 v 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
*******************************************************************************/
package org.aspectj.testing.server;
diff --git a/testing-client/src/test/java/org/aspectj/testing/TesterTest.java b/testing-client/src/test/java/org/aspectj/testing/TesterTest.java
index e757dfc4b..13928496a 100644
--- a/testing-client/src/test/java/org/aspectj/testing/TesterTest.java
+++ b/testing-client/src/test/java/org/aspectj/testing/TesterTest.java
@@ -3,9 +3,9 @@
* 2002 Palo Alto Research Center, Incorporated (PARC).
* All rights reserved.
* This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
* which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
*
* Contributors:
* Xerox/PARC initial implementation
diff --git a/testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java b/testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java
index 09d0e712d..401cc9b1e 100644
--- a/testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java
+++ b/testing-client/src/test/java/org/aspectj/testing/TestingClientModuleTests.java
@@ -1,14 +1,14 @@
/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
+ * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC).
- * 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
- *
- * Contributors:
- * Xerox/PARC initial implementation
+ * 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
+ *
+ * Contributors:
+ * Xerox/PARC initial implementation
* ******************************************************************/
package org.aspectj.testing;
@@ -19,13 +19,13 @@ import junit.framework.*;
public class TestingClientModuleTests extends TestCase {
- public static Test suite() {
+ public static Test suite() {
TestSuite suite = new TestSuite(TestingClientModuleTests.class.getName());
- suite.addTestSuite(TesterTest.class);
- suite.addTestSuite(TestServerTest.class);
+ suite.addTestSuite(TesterTest.class);
+ suite.addTestSuite(TestServerTest.class);
return suite;
}
public TestingClientModuleTests(String name) { super(name); }
-}
+}
diff --git a/testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java b/testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java
index 0f40d3a03..5831cd29d 100644
--- a/testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java
+++ b/testing-client/src/test/java/org/aspectj/testing/server/TestServerTest.java
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 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
+ * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
* Contributors:
* Matthew Webster - initial implementation
*******************************************************************************/
@@ -19,7 +19,7 @@ import static org.aspectj.testing.server.TestServer.REGEX_PROJECT_ROOT_FOLDER;
public class TestServerTest extends TestCase {
private TestServer server;
-
+
protected void setUp() throws Exception {
super.setUp();
server = new TestServer();