Bug 190923 [prov] Javascript in provisioning metadata has poor maintainability

1 files changed, 152 insertions, 76 deletions

diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java
index 832e2c15f..b59511686 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java
@@ -13,18 +13,16 @@ package org.eclipse.equinox.internal.p2.touchpoint.natives;
 import java.io.File;
 import java.net.URL;
 import java.util.*;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.p2.artifact.repository.*;
 import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
 import org.eclipse.equinox.p2.core.location.AgentLocation;
 import org.eclipse.equinox.p2.engine.*;
 import org.eclipse.equinox.p2.metadata.*;
-import org.mozilla.javascript.*;
 import org.osgi.framework.Version;
 
 public class NativeTouchpoint extends Touchpoint {
-	private final static String CONFIGURATION_DATA = "configurationData";
+	//	private final static String CONFIGURATION_DATA = "configurationData";
 	private static final String ID = "org.eclipse.equinox.p2.touchpoint.natives"; //$NON-NLS-1$
 
 	private final Set supportedPhases = new HashSet(); //TODO This should probably come from XML
@@ -57,88 +55,137 @@ public class NativeTouchpoint extends Touchpoint {
 			};
 		}
 
-		if (actionId.equals("install")) {
+		if (actionId.equals("unzip")) {
 			return new ProvisioningAction() {
 				public IStatus execute(Map parameters) {
-					Profile profile = (Profile) parameters.get("profile");
-					Operand operand = (Operand) parameters.get("operand");
-					return doInstall(operand.second(), profile);
+					String source = (String) parameters.get("source");
+					String target = (String) parameters.get("target");
+
+					if (source.equals("@artifact")) {
+						IInstallableUnit iu = (IInstallableUnit) parameters.get("iu");
+						//TODO: fix wherever this occurs -- investigate as this is probably not desired
+						if (iu.getArtifacts() == null || iu.getArtifacts().length == 0)
+							return Status.OK_STATUS;
+
+						IArtifactKey artifactKey = iu.getArtifacts()[0];
+
+						IFileArtifactRepository downloadCache = getDownloadCacheRepo();
+						File fileLocation = downloadCache.getArtifactFile(artifactKey);
+						if (!fileLocation.exists())
+							return new Status(IStatus.ERROR, ID, "The file is not available" + fileLocation.getAbsolutePath());
+						source = fileLocation.getAbsolutePath();
+					}
+
+					new Zip().unzip(source, target, null);
+					return Status.OK_STATUS;
 				}
 
 				public IStatus undo(Map parameters) {
-					Profile profile = (Profile) parameters.get("profile");
-					Operand operand = (Operand) parameters.get("operand");
-					return doUninstall(operand.second(), profile);
+					//TODO: implement undo
+					return Status.OK_STATUS;
 				}
 			};
 		}
-		if (actionId.equals("uninstall")) {
+		if (actionId.equals("chmod")) {
 			return new ProvisioningAction() {
 				public IStatus execute(Map parameters) {
-					Profile profile = (Profile) parameters.get("profile");
-					Operand operand = (Operand) parameters.get("operand");
-					return doUninstall(operand.first(), profile);
+					String targetDir = (String) parameters.get("targetDir");
+					String targetFile = (String) parameters.get("targetFile");
+					String permissions = (String) parameters.get("permissions");
+
+					new Permissions().chmod(targetDir, targetFile, null);
+					return Status.OK_STATUS;
 				}
 
 				public IStatus undo(Map parameters) {
-					Profile profile = (Profile) parameters.get("profile");
-					Operand operand = (Operand) parameters.get("operand");
-					return doInstall(operand.first(), profile);
+					//TODO: implement undo ??
+					return Status.OK_STATUS;
 				}
 			};
 		}
 
-		return null;
-	}
+		//		if (actionId.equals("OLDinstall")) {
+		//			return new ProvisioningAction() {
+		//				public IStatus execute(Map parameters) {
+		//					Profile profile = (Profile) parameters.get("profile");
+		//					Operand operand = (Operand) parameters.get("operand");
+		//					return doInstall(operand.second(), profile);
+		//				}
+		//
+		//				public IStatus undo(Map parameters) {
+		//					Profile profile = (Profile) parameters.get("profile");
+		//					Operand operand = (Operand) parameters.get("operand");
+		//					return doUninstall(operand.second(), profile);
+		//				}
+		//			};
+		//		}
+		//		if (actionId.equals("OLDuninstall")) {
+		//			return new ProvisioningAction() {
+		//				public IStatus execute(Map parameters) {
+		//					Profile profile = (Profile) parameters.get("profile");
+		//					Operand operand = (Operand) parameters.get("operand");
+		//					return doUninstall(operand.first(), profile);
+		//				}
+		//
+		//				public IStatus undo(Map parameters) {
+		//					Profile profile = (Profile) parameters.get("profile");
+		//					Operand operand = (Operand) parameters.get("operand");
+		//					return doInstall(operand.first(), profile);
+		//				}
+		//			};
+		//		}
 
-	private IStatus doInstall(IInstallableUnit unitToInstall, Profile profile) {
-		//Get the cache
-		IArtifactRepository dlCache = getDownloadCacheRepo();
-		if (unitToInstall.getArtifacts() == null || unitToInstall.getArtifacts().length == 0)
-			return Status.OK_STATUS;
-
-		IFileArtifactRepository repoToCheck = (IFileArtifactRepository) dlCache.getAdapter(IFileArtifactRepository.class);
-		File fileLocation = repoToCheck.getArtifactFile(unitToInstall.getArtifacts()[0]);
-		if (!fileLocation.exists())
-			return new Status(IStatus.ERROR, ID, "The file is not available" + fileLocation.getAbsolutePath());
-
-		TouchpointData[] touchpointData = unitToInstall.getTouchpointData();
-		Context cx = Context.enter();
-		Scriptable scope = cx.initStandardObjects();
-		ScriptableObject.putProperty(scope, "artifact", fileLocation.getAbsolutePath());
-		ScriptableObject.putProperty(scope, "currentDir", getInstallFolder(profile));
-		ScriptableObject.putProperty(scope, "Zip", new Zip());
-		ScriptableObject.putProperty(scope, "Permissions", new Permissions());
-		String[] configurationData = getInstructionsFor(CONFIGURATION_DATA, touchpointData);
-		for (int i = 0; i < configurationData.length; i++) {
-			try {
-				cx.evaluateString(scope, configurationData[i], unitToInstall.getId(), 1, null);
-			} catch (RuntimeException e) {
-				return new Status(IStatus.ERROR, Activator.ID, "Exception while executing " + configurationData[i], e);
-			}
-		}
-		return Status.OK_STATUS;
+		return null;
 	}
 
-	private IStatus doUninstall(IInstallableUnit unitToInstall, Profile profile) {
-		// TODO: implement uninstall 
-		return Status.OK_STATUS;
-	}
+	//	private IStatus doInstall(IInstallableUnit unitToInstall, Profile profile) {
+	//		//Get the cache
+	//		IArtifactRepository dlCache = getDownloadCacheRepo();
+	//		if (unitToInstall.getArtifacts() == null || unitToInstall.getArtifacts().length == 0)
+	//			return Status.OK_STATUS;
+	//
+	//		IFileArtifactRepository repoToCheck = (IFileArtifactRepository) dlCache.getAdapter(IFileArtifactRepository.class);
+	//		File fileLocation = repoToCheck.getArtifactFile(unitToInstall.getArtifacts()[0]);
+	//		if (!fileLocation.exists())
+	//			return new Status(IStatus.ERROR, ID, "The file is not available" + fileLocation.getAbsolutePath());
+	//
+	//		TouchpointData[] touchpointData = unitToInstall.getTouchpointData();
+	//		Context cx = Context.enter();
+	//		Scriptable scope = cx.initStandardObjects();
+	//		ScriptableObject.putProperty(scope, "artifact", fileLocation.getAbsolutePath());
+	//		ScriptableObject.putProperty(scope, "currentDir", getInstallFolder(profile));
+	//		ScriptableObject.putProperty(scope, "Zip", new Zip());
+	//		ScriptableObject.putProperty(scope, "Permissions", new Permissions());
+	//		String[] configurationData = getInstructionsFor(CONFIGURATION_DATA, touchpointData);
+	//		for (int i = 0; i < configurationData.length; i++) {
+	//			try {
+	//				cx.evaluateString(scope, configurationData[i], unitToInstall.getId(), 1, null);
+	//			} catch (RuntimeException e) {
+	//				return new Status(IStatus.ERROR, Activator.ID, "Exception while executing " + configurationData[i], e);
+	//			}
+	//		}
+	//		return Status.OK_STATUS;
+	//	}
+	//
+	//	private IStatus doUninstall(IInstallableUnit unitToInstall, Profile profile) {
+	//		// TODO: implement uninstall 
+	//		return Status.OK_STATUS;
+	//	}
 
-	private String[] getInstructionsFor(String key, TouchpointData[] data) {
-		String[] matches = new String[data.length];
-		int count = 0;
-		for (int i = 0; i < data.length; i++) {
-			matches[count] = data[i].getInstructions(key);
-			if (matches[count] != null)
-				count++;
-		}
-		if (count == data.length)
-			return matches;
-		String[] result = new String[count];
-		System.arraycopy(matches, 0, result, 0, count);
-		return result;
-	}
+	//	private String[] getInstructionsFor(String key, TouchpointData[] data) {
+	//		String[] matches = new String[data.length];
+	//		int count = 0;
+	//		for (int i = 0; i < data.length; i++) {
+	//			matches[count] = data[i].getInstructions(key);
+	//			if (matches[count] != null)
+	//				count++;
+	//		}
+	//		if (count == data.length)
+	//			return matches;
+	//		String[] result = new String[count];
+	//		System.arraycopy(matches, 0, result, 0, count);
+	//		return result;
+	//	}
 
 	public TouchpointType getTouchpointType() {
 		return new TouchpointType("native", new Version(1, 0, 0));
@@ -167,21 +214,50 @@ public class NativeTouchpoint extends Touchpoint {
 		return profile.getValue(Profile.PROP_INSTALL_FOLDER);
 	}
 
-	private IArtifactRepositoryManager getArtifactRepositoryManager() {
+	private static AgentLocation getAgentLocation() {
+		return (AgentLocation) ServiceHelper.getService(Activator.getContext(), AgentLocation.class.getName());
+	}
+
+	static private IArtifactRepositoryManager getArtifactRepositoryManager() {
 		return (IArtifactRepositoryManager) ServiceHelper.getService(Activator.getContext(), IArtifactRepositoryManager.class.getName());
 	}
 
-	private IArtifactRepository getDownloadCacheRepo() {
-		IArtifactRepository repository = getArtifactRepositoryManager().getRepository(getDownloadCacheLocation());
-		if (!repository.isModifiable())
-			throw new IllegalStateException("Download cache is not writable: " + repository.getLocation()); //$NON-NLS-1$
-		return repository;
+	static private void tagAsImplementation(IArtifactRepository repository) {
+		//		if (repository != null && repository.getProperties().getProperty(IRepositoryInfo.IMPLEMENTATION_ONLY_KEY) == null) {
+		//			IWritableRepositoryInfo writableInfo = (IWritableRepositoryInfo) repository.getAdapter(IWritableRepositoryInfo.class);
+		//			if (writableInfo != null) {
+		//				writableInfo.getModifiableProperties().setProperty(IRepositoryInfo.IMPLEMENTATION_ONLY_KEY, Boolean.valueOf(true).toString());
+		//			}
+		//		}
 	}
 
-	private URL getDownloadCacheLocation() {
-		AgentLocation location = (AgentLocation) ServiceHelper.getService(Activator.getContext(), AgentLocation.class.getName());
-		if (location == null)
-			return null;
-		return location.getArtifactRepositoryURL();
+	static private IFileArtifactRepository getDownloadCacheRepo() {
+		URL location = getDownloadCacheLocation();
+		IArtifactRepositoryManager manager = getArtifactRepositoryManager();
+		IArtifactRepository repository = manager.loadRepository(location, null);
+		if (repository == null) {
+			// 	the given repo location is not an existing repo so we have to create something
+			// TODO for now create a random repo by default.
+			String repositoryName = location + " - Agent download cache"; //$NON-NLS-1$
+			repository = manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.artifact.repository.simpleRepository");
+			// TODO: do we still need to do this
+			tagAsImplementation(repository);
+		}
+
+		IFileArtifactRepository downloadCache = (IFileArtifactRepository) repository.getAdapter(IFileArtifactRepository.class);
+		if (downloadCache == null) {
+			throw new IllegalArgumentException("Agent download cache not writeable: " + location); //$NON-NLS-1$
+		}
+		return downloadCache;
+	}
+
+	static private URL getDownloadCacheLocation() {
+		AgentLocation location = getAgentLocation();
+		return (location != null ? location.getArtifactRepositoryURL() : null);
+	}
+
+	public IStatus initializePhase(IProgressMonitor monitor, Profile profile, String phaseId, Map touchpointParameters) {
+		touchpointParameters.put("installFolder", getInstallFolder(profile));
+		return null;
 	}
 }