Deploy embed node.js in workspace.

Author: angelozerr

eclipse/ts.eclipse.ide.core/schema/nodeJSInstalls.exsd

@@ -45,34 +45,51 @@
    </element>
 
    <element name="install">
+      <annotation>
+         <documentation>
+            This extension point allows developers to specify their own Node.js install location. This can be done in two ways:
+&lt;ol&gt;
+&lt;li&gt;A developer can implement &lt;i&gt;INodejsInstallProvider&lt;/i&gt; interface to programmatically tell Tern.java where Node.js is installed. This is useful for situations where you need to do some computations before specifying the location path.
+&lt;li&gt;Bundle Node.js in the extending bundle and specify the location of the Node program relative to the bundle. If you ship Node.js in your bundle in the form of a ZIP archive, make sure you specify the ZIP location withing the bundle using the &lt;i&gt;zip&lt;/i&gt; attribute. 
+&lt;/ol&gt;
+         </documentation>
+      </annotation>
       <complexType>
-         <sequence>
-         </sequence>
          <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  The id of this Nodejs install. Each known Nodejs install has a distinct id. Ids are intended to be used internally as keys; they are not intended to be shown to end users.
                </documentation>
             </annotation>
          </attribute>
          <attribute name="name" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  The displayable name for this Nodejs install.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  Provides a way to programmatically specify the install location of a Node.js within the system. This allows extenders to compute install locations that are not in the extending bundle. Extenders must implement &lt;i&gt;tern.eclipse.ide.server.nodejs.core.INodejsInstallProvider&lt;/i&gt; interface.
                </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":tern.eclipse.ide.server.nodejs.core.INodejsInstallProvider"/>
+               </appinfo>
             </annotation>
          </attribute>
-         <attribute name="path" type="string" use="required">
+         <attribute name="path" type="string">
             <annotation>
                <documentation>
-                  
+                  The file path for this Nodejs install.
                </documentation>
             </annotation>
          </attribute>
          <attribute name="zip" type="string">
             <annotation>
                <documentation>
-                  
+                  If path doesn&apos;t exist, specify a ZIP archive within the bundle that contains the node program. This extension will unzip it and look for the node path.
                </documentation>
             </annotation>
          </attribute>
@@ -100,4 +117,4 @@
    </annotation>
 
 
-</schema>
+</schema>

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/nodejs/INodejsInstallProvider.java

@@ -0,0 +1,30 @@
+/**
+ *  Copyright (c) 2016 Angelo ZERR, IBM
+ *  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:
+ *  Victor Sosa <[email protected]>- initial API and implementation
+ */
+package ts.eclipse.ide.core.nodejs;
+
+import java.io.File;
+
+/**
+ * Provides a way to programmatically specify the install location of a Node.js
+ * within the system.
+ * 
+ * @author <a href="mailto:[email protected]">[email protected]</a>
+ *
+ */
+public interface INodejsInstallProvider {
+	
+	/**
+	 * Location where this Node.js is installed
+	 * 
+	 * @return Node.js install location
+	 */
+	File getPath();
+}

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/nodejs/NodejsInstall.java

@@ -1,29 +1,37 @@
 /**
- *  Copyright (c) 2013-2016 Angelo ZERR.
+ *  Copyright (c) 2013-2016 Angelo ZERR, IBM.
  *  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:
  *  Angelo Zerr <[email protected]> - initial API and implementation
+ *  Victor Sosa <[email protected]> - Extension to allow locations computed programmatically
  */
 package ts.eclipse.ide.internal.core.nodejs;
 
 import java.io.File;
 import java.io.IOException;
 
+import org.eclipse.core.internal.runtime.InternalPlatform;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
 
 import ts.eclipse.ide.core.nodejs.IEmbeddedNodejs;
+import ts.eclipse.ide.core.nodejs.INodejsInstallProvider;
+import ts.eclipse.ide.internal.core.Trace;
 import ts.utils.ZipUtils;
 
+
+@SuppressWarnings("restriction")
 public class NodejsInstall implements IEmbeddedNodejs {
 
-	private final String id;
-	private final String name;
+	private String id;
+	private String name;
 	private File path;
 
 	/**
@@ -34,27 +42,51 @@ public class NodejsInstall implements IEmbeddedNodejs {
 	 * @throws IOException
 	 */
 	public NodejsInstall(IConfigurationElement element) throws IOException {
+		createClass(element);
+	}
+	
+	private void createClass(IConfigurationElement element) throws IOException {
 		this.id = element.getAttribute("id");
 		this.name = element.getAttribute("name");
-		String pluginId = element.getNamespaceIdentifier();
-		String path = element.getAttribute("path");
-		if (path != null && path.length() > 0) {
-			File baseDir = FileLocator.getBundleFile(Platform.getBundle(pluginId));
-			this.path = new File(baseDir, path);
-
-			// check if path exists, if it doesn't look for zip
-			if (!this.path.exists()) {
-				String zip = element.getAttribute("zip");
-
-				File zipFile = new File(baseDir, zip);
-
-				if (zipFile.exists()) {
-					if (zipFile.getName().toLowerCase().endsWith(".zip")) {
-						ZipUtils.extract(zipFile, baseDir);
-					}
-
-					if (this.path.exists()) {
-						this.path.setExecutable(true);
+		
+		String clazz = element.getAttribute("class");
+		if (clazz != null && !clazz.isEmpty()) {
+			try {
+				INodejsInstallProvider provider = (INodejsInstallProvider) element.createExecutableExtension("class");
+				this.path = provider.getPath();
+			} catch (CoreException e) {
+				Trace.trace(Trace.SEVERE, "Problems at creating install provider", e);
+			}
+		} else {
+			String pluginId = element.getNamespaceIdentifier();
+			String path = element.getAttribute("path");
+			if (path != null && path.length() > 0) {
+				File bundleDir = FileLocator.getBundleFile(Platform
+						.getBundle(pluginId));
+				
+				IPath stateLocationPath = InternalPlatform.getDefault().getStateLocation(Platform
+						.getBundle(pluginId));
+				
+				if (stateLocationPath != null) {
+					File baseDir = stateLocationPath.toFile();
+	
+					this.path = new File(baseDir, path);
+		
+					// check if path exists, if it doesn't look for zip
+					if (!this.path.exists()) {
+						String zip = element.getAttribute("zip");
+		
+						File zipFile = new File(bundleDir, zip);
+		
+						if (zipFile.exists()) {
+							if (zipFile.getName().toLowerCase().endsWith(".zip")) {
+								ZipUtils.extract(zipFile, baseDir);
+							}
+		
+							if(this.path.exists()) {
+								this.path.setExecutable(true);
+							}
+						}
 					}
 				}
 			}
@@ -80,4 +112,4 @@ public void dispose() {
 
 	}
 
-}
+}