[545746] remove outdated constructors that refer to IPluginDescriptor

Signed-off-by: Nitin Dahyabhai <nitind@us.ibm.com>

Change-Id: Ib57d22389b52047169a454ca13e5f14999f58c97

8 files changed, 13 insertions, 26 deletions

diff --git a/features/org.eclipse.wst.common_tests.feature/feature.xml b/features/org.eclipse.wst.common_tests.feature/feature.xml
index 3b6ec3371..6a23290dc 100644
--- a/features/org.eclipse.wst.common_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.common_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.wst.common_tests.feature"

       label="%featureName"

-      version="3.6.1.qualifier"

+      version="3.7.0.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="1.0.1.qualifier">

diff --git a/features/org.eclipse.wst.common_tests.feature/pom.xml b/features/org.eclipse.wst.common_tests.feature/pom.xml
index 9dbc061b3..795dc5e5f 100644
--- a/features/org.eclipse.wst.common_tests.feature/pom.xml
+++ b/features/org.eclipse.wst.common_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.common_tests.feature</artifactId>

-  <version>3.6.1-SNAPSHOT</version>

+  <version>3.7.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>
diff --git a/tests/org.eclipse.wst.common.tests.collector/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests.collector/META-INF/MANIFEST.MF
index f3a87e49a..b3807855b 100644
--- a/tests/org.eclipse.wst.common.tests.collector/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.common.tests.collector/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %org.eclipse.wst.common.tests.collector
 Bundle-SymbolicName: org.eclipse.wst.common.tests.collector; singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Bundle-ClassPath: runtime/collector.jar
 Bundle-Activator: org.eclipse.wst.common.tests.collector.TestCollectorPlugin
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorPlugin.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorPlugin.java
index 47326dff5..c10c3945a 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorPlugin.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 IBM Corporation and others.
+ * Copyright (c) 2015, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -11,8 +11,9 @@
 package org.eclipse.wst.common.tests.collector;
 
 import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginDescriptor;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
 
 
 public class TestCollectorPlugin extends Plugin {
@@ -20,13 +21,9 @@ public class TestCollectorPlugin extends Plugin {
 	public static TestCollectorPlugin instance = null;
 	public IExtensionPoint dataModelVerifierExt = null;
 	
-	/**
-	 * @param descriptor
-	 */
-	public TestCollectorPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		instance = this;
-		dataModelVerifierExt = descriptor.getExtensionPoint("DataModelVerifier");
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		dataModelVerifierExt = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, "DataModelVerifier");
 	}
 
 }
diff --git a/tests/org.eclipse.wst.common.tests.collector/pom.xml b/tests/org.eclipse.wst.common.tests.collector/pom.xml
index 840ff2b42..d965b8121 100644
--- a/tests/org.eclipse.wst.common.tests.collector/pom.xml
+++ b/tests/org.eclipse.wst.common.tests.collector/pom.xml
@@ -21,6 +21,6 @@
 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.common.tests.collector</artifactId>

-  <version>1.1.100-SNAPSHOT</version>

+  <version>1.1.200-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>
diff --git a/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF
index fe8f2ceb3..f83e7b43e 100644
--- a/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.common.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.common.tests; singleton:=true
-Bundle-Version: 1.2.400.qualifier
+Bundle-Version: 1.2.500.qualifier
 Bundle-ClassPath: commontests.jar
 Bundle-Activator: org.eclipse.wst.common.tests.CommonTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.common.tests/commontests/org/eclipse/wst/common/tests/CommonTestsPlugin.java b/tests/org.eclipse.wst.common.tests/commontests/org/eclipse/wst/common/tests/CommonTestsPlugin.java
index bfe3290be..bb322bab1 100644
--- a/tests/org.eclipse.wst.common.tests/commontests/org/eclipse/wst/common/tests/CommonTestsPlugin.java
+++ b/tests/org.eclipse.wst.common.tests/commontests/org/eclipse/wst/common/tests/CommonTestsPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2015 IBM Corporation and others.
+ * Copyright (c) 2003, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
 package org.eclipse.wst.common.tests;
 
 import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginDescriptor;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
@@ -20,15 +19,6 @@ public class CommonTestsPlugin extends Plugin {
 	public static String PLUGIN_ID = "org.eclipse.wst.common.tests";
 	public static CommonTestsPlugin instance = null;
 	public IExtensionPoint dataModelVerifierExt = null;
-	
-	/**
-	 * @param descriptor
-	 */
-	public CommonTestsPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		instance = this;
-		dataModelVerifierExt = descriptor.getExtensionPoint("DataModelVerifier");
-	}
 
 	// default constructor for use of start() and stop()
 	public CommonTestsPlugin()
diff --git a/tests/org.eclipse.wst.common.tests/pom.xml b/tests/org.eclipse.wst.common.tests/pom.xml
index fde72eb7b..c380f0ee7 100644
--- a/tests/org.eclipse.wst.common.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.tests/pom.xml
@@ -21,7 +21,7 @@
 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.common.tests</artifactId>

-  <version>1.2.400-SNAPSHOT</version>

+  <version>1.2.500-SNAPSHOT</version>

   <packaging>eclipse-test-plugin</packaging>

 

   <properties>