[251639] Initial check-in

4 files changed, 10 insertions, 9 deletions

diff --git a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/P2Test.java b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/P2Test.java
index 2eba8e9b2..a32682597 100644
--- a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/P2Test.java
+++ b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/P2Test.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.server.discovery.internal;
 
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -37,8 +37,8 @@ public class P2Test {
 			System.out.println("---p2---");
 			//SimpleMetadataRepositoryFactory mrf = new SimpleMetadataRepositoryFactory();
 			UpdateSiteMetadataRepositoryFactory mrf = new UpdateSiteMetadataRepositoryFactory();
-			URL url = new URL("http://www.apache.org/dist/geronimo/eclipse/updates/");
-			IMetadataRepository repo = mrf.load(url, null);
+			URI uri = new URI("http://www.apache.org/dist/geronimo/eclipse/updates/");
+			IMetadataRepository repo = mrf.load(uri, null);
 			System.out.println("Repo: " + repo);
 			//Query query = new InstallableUnitQuery(null);
 			Query query = new InstallableUnitQuery("org.eclipse.wst.server.core.serverAdapter");
diff --git a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/Extension.java b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/Extension.java
index 7cebc58c4..37cef0636 100644
--- a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/Extension.java
+++ b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/Extension.java
@@ -22,7 +22,7 @@ import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
 import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
 import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
 import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.internal.provisional.p2.ui.query.IUPropertyUtils;
+import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.wst.server.discovery.internal.Activator;
diff --git a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/ExtensionUpdateSite.java b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/ExtensionUpdateSite.java
index 6428c48af..cc8a18a5c 100644
--- a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/ExtensionUpdateSite.java
+++ b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/model/ExtensionUpdateSite.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.server.discovery.internal.model;
 
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -75,7 +75,7 @@ public class ExtensionUpdateSite implements IExtensionSite {
 	public List<IExtension> getExtensions(IProgressMonitor monitor) throws CoreException {
 		try {
 			UpdateSiteMetadataRepositoryFactory mrf = new UpdateSiteMetadataRepositoryFactory();
-			URL url2 = new URL(url);
+			URI url2 = new URI(url);
 			IMetadataRepository repo = mrf.load(url2, monitor);
 			//System.out.println("Repo: " + repo);
 			//Query query = new InstallableUnitQuery(null);
diff --git a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/wizard/ExtensionWizard.java b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/wizard/ExtensionWizard.java
index 05a8403d4..8783d20f0 100644
--- a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/wizard/ExtensionWizard.java
+++ b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/wizard/ExtensionWizard.java
@@ -13,9 +13,9 @@ package org.eclipse.wst.server.discovery.internal.wizard;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.equinox.internal.p2.ui.dialogs.AcceptLicensesWizardPage;
+import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
 import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.internal.provisional.p2.ui.SimpleLicenseManager;
+import org.eclipse.equinox.internal.p2.ui.dialogs.AcceptLicensesWizardPage;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
@@ -39,7 +39,8 @@ public class ExtensionWizard extends Wizard {
 	public void addPages() {
 		super.addPages();
 		//licensePage = new LicenseWizardPage();
-		licensePage = new AcceptLicensesWizardPage(new IInstallableUnit[0], new SimpleLicenseManager(), null);
+		Policy policy = new Policy();
+		licensePage = new AcceptLicensesWizardPage(policy, new IInstallableUnit[0], null);
 		extensionPage = new ExtensionWizardPage(licensePage);
 		addPage(extensionPage);
 		addPage(licensePage);