hdt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsha...@apache.org
Subject [5/6] git commit: HDT 7 : - extraction of UI for each Version to individual plugins. - cleaning up existing UI
Date Fri, 20 Jun 2014 08:37:44 GMT
 HDT 7 :
  - extraction of UI for each Version to individual plugins.
  - cleaning up existing UI


Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/c308e976
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/c308e976
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/c308e976

Branch: refs/heads/hadoop-eclipse-merge-development
Commit: c308e976b39c4a78fe991f4652bc40e3dcf7e4a4
Parents: 9d78cbd
Author: Rahul Sharma <rsharma@apache.org>
Authored: Sat Jun 14 20:08:19 2014 +0530
Committer: Rahul Sharma <rsharma@apache.org>
Committed: Mon Jun 16 11:07:28 2014 +0530

----------------------------------------------------------------------
 .../src/org/apache/hdt/core/HadoopVersion.java  |  34 +
 .../hdt/core/launch/AbstractHadoopCluster.java  |  49 +-
 .../org/apache/hdt/core/launch/ConfProp.java    |  16 +-
 .../hdt/hadoop/release/HadoopCluster.java       |  26 +-
 .../release/HadoopV1ConfigurationBuilder.java   | 690 +++++++++++++++
 .../hdt/hadoop2/release/HadoopCluster.java      |  42 +-
 .../release/HadoopV2ConfigurationBuilder.java   | 771 +++++++++++++++++
 .../internal/hdfs/NewHDFSServerWizardPage.java  |   7 +-
 .../internal/launch/HadoopLocationWizard.java   | 859 +++----------------
 9 files changed, 1664 insertions(+), 830 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.core/src/org/apache/hdt/core/HadoopVersion.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/HadoopVersion.java b/org.apache.hdt.core/src/org/apache/hdt/core/HadoopVersion.java
new file mode 100644
index 0000000..020b7d9
--- /dev/null
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/HadoopVersion.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hdt.core;
+
+
+public enum HadoopVersion {
+	Version1("1.1"), Version2("2.2");
+
+	private String displayName;
+
+	private HadoopVersion(String displayName) {
+		this.displayName = displayName;
+	}
+	
+	public String getDisplayName() {
+		return displayName;
+	}
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.core/src/org/apache/hdt/core/launch/AbstractHadoopCluster.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/launch/AbstractHadoopCluster.java b/org.apache.hdt.core/src/org/apache/hdt/core/launch/AbstractHadoopCluster.java
index e2fa064..57862ef 100644
--- a/org.apache.hdt.core/src/org/apache/hdt/core/launch/AbstractHadoopCluster.java
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/launch/AbstractHadoopCluster.java
@@ -31,11 +31,13 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.hdt.core.Activator;
+import org.apache.hdt.core.HadoopVersion;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.swt.widgets.Composite;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -44,7 +46,19 @@ import org.w3c.dom.Text;
 import org.xml.sax.SAXException;
 
 public abstract class AbstractHadoopCluster {
-	
+
+	public interface ChangeListener {
+		void notifyChange(ConfProp prop, String propValue);
+	}
+
+	public interface HadoopConfigurationBuilder {
+		void buildControl(Composite panel);
+
+		void notifyChange(ConfProp confProp, String text);
+
+		void setChangeListener(ChangeListener l);
+	}
+
 	private static final Logger logger = Logger.getLogger(AbstractHadoopCluster.class);
 
 	abstract public String getLocationName();
@@ -68,7 +82,7 @@ public abstract class AbstractHadoopCluster {
 	abstract public void setConfPropValue(ConfProp prop, String propValue);
 
 	abstract public void setConfPropValue(String propName, String propValue);
-	
+
 	abstract public Iterator<Entry<String, String>> getConfiguration();
 
 	abstract public void purgeJob(IHadoopJob job);
@@ -80,39 +94,40 @@ public abstract class AbstractHadoopCluster {
 	abstract public String getState();
 
 	abstract protected boolean loadConfiguration(Map<String, String> configuration);
-	
+
 	abstract public boolean isAvailable() throws CoreException;
-	
-	abstract public String getVersion();
-	
+
+	abstract public HadoopVersion getVersion();
+
+	abstract public HadoopConfigurationBuilder getUIConfigurationBuilder();
+
 	public static AbstractHadoopCluster createCluster(File file) throws CoreException, IOException {
 		Map<String, String> configuration = loadXML(file);
 		String version = configuration.get(ConfProp.PI_HADOOP_VERSION.name);
-		AbstractHadoopCluster hadoopCluster = createCluster(version!=null?version:ConfProp.PI_HADOOP_VERSION.defVal);
+		AbstractHadoopCluster hadoopCluster = createCluster(version != null ? version : ConfProp.PI_HADOOP_VERSION.defVal);
 		hadoopCluster.loadConfiguration(configuration);
 		return hadoopCluster;
 	}
 
 	public static AbstractHadoopCluster createCluster(String hadoopVersion) throws CoreException {
-		logger.debug("Creating client for version "+hadoopVersion); 
+		logger.debug("Creating client for version " + hadoopVersion);
 		IConfigurationElement[] elementsFor = Platform.getExtensionRegistry().getConfigurationElementsFor("org.apache.hdt.core.hadoopCluster");
 		for (IConfigurationElement configElement : elementsFor) {
 			String version = configElement.getAttribute("protocolVersion");
-			if(version.equalsIgnoreCase(hadoopVersion)){
-				return (AbstractHadoopCluster)configElement.createExecutableExtension("class");
+			if (version.equalsIgnoreCase(hadoopVersion)) {
+				return (AbstractHadoopCluster) configElement.createExecutableExtension("class");
 			}
 		}
-		throw new CoreException(new Status(Status.ERROR,Activator.BUNDLE_ID,"No clinet found for hadoop version "+hadoopVersion));
+		throw new CoreException(new Status(Status.ERROR, Activator.BUNDLE_ID, "No clinet found for hadoop version " + hadoopVersion));
 	}
 
 	public static AbstractHadoopCluster createCluster(AbstractHadoopCluster existing) throws CoreException {
-		AbstractHadoopCluster hadoopCluster = createCluster(existing.getVersion());
+		AbstractHadoopCluster hadoopCluster = createCluster(existing.getVersion().getDisplayName());
 		hadoopCluster.load(existing);
 		return hadoopCluster;
 	}
-	
-	
-	protected static Map<String,String> loadXML(File file) {
+
+	protected static Map<String, String> loadXML(File file) {
 		DocumentBuilder builder;
 		Document document;
 		try {
@@ -132,7 +147,7 @@ public abstract class AbstractHadoopCluster {
 		if (!"configuration".equals(root.getTagName()))
 			return null;
 		NodeList props = root.getChildNodes();
-		Map<String,String> configuration= new HashMap<String, String>();
+		Map<String, String> configuration = new HashMap<String, String>();
 		for (int i = 0; i < props.getLength(); i++) {
 			Node propNode = props.item(i);
 			if (!(propNode instanceof Element))
@@ -166,7 +181,7 @@ public abstract class AbstractHadoopCluster {
 	public ConfProp getConfPropForName(String propName) {
 		return ConfProp.getByName(propName);
 	}
-	
+
 	public String getConfPropName(ConfProp prop) {
 		return prop.name;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.core/src/org/apache/hdt/core/launch/ConfProp.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/launch/ConfProp.java b/org.apache.hdt.core/src/org/apache/hdt/core/launch/ConfProp.java
index 8b91dbe..b23adf9 100644
--- a/org.apache.hdt.core/src/org/apache/hdt/core/launch/ConfProp.java
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/launch/ConfProp.java
@@ -36,6 +36,10 @@ public enum ConfProp {
 	 * Property name for the master host name (the Job tracker)
 	 */
 	PI_JOB_TRACKER_HOST(true, "jobtracker.host", "localhost"),
+	
+	PI_RESOURCE_MGR_HOST(true, "rm.host", "localhost"),
+	
+	PI_JOB_HISTORY_HOST(true, "jobhistory.host", "localhost"),
 
 	/**
 	 * Property name for the DFS master host name (the Name node)
@@ -43,10 +47,6 @@ public enum ConfProp {
 	PI_NAME_NODE_HOST(true, "namenode.host", "localhost"),
 
 	/**
-	 * Property name for the installation directory on the master node
-	 */
-	// PI_INSTALL_DIR(true, "install.dir", "/dir/hadoop-version/"),
-	/**
 	 * User name to use for Hadoop operations
 	 */
 	PI_USER_NAME(true, "user.name", System.getProperty("user.name", "who are you?")),
@@ -75,6 +75,10 @@ public enum ConfProp {
 	 * TCP port number for the job tracker
 	 */
 	PI_JOB_TRACKER_PORT(true, "jobtracker.port", "50020"),
+	
+	PI_RESOURCE_MGR_PORT(true, "rm.port", "8032"),
+	
+	PI_JOB_HISTORY_PORT(true, "jobhistory.port", "10020"),
 
 	/**
 	 * Are the Map/Reduce and the Distributed FS masters hosted on the same
@@ -92,6 +96,10 @@ public enum ConfProp {
 	 * Property name for naming the default file system (URI).
 	 */
 	FS_DEFAULT_URI(false, "fs.default.name", "hdfs://localhost:50040/"),
+	
+	RM_DEFAULT_URI(false, "yarn.resourcemanager.address", "localhost:8032"),
+	
+	JOB_HISTORY_DEFAULT_URI(false, "mapreduce.jobhistory.address", "localhost:10020"),
 
 	/**
 	 * Property name for the default socket factory:

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopCluster.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopCluster.java b/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopCluster.java
index 167ae29..54c5500 100644
--- a/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopCluster.java
+++ b/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopCluster.java
@@ -28,22 +28,17 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.ServiceLoader;
 import java.util.Map.Entry;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.IOUtils;
@@ -53,6 +48,7 @@ import org.apache.hadoop.mapred.JobID;
 import org.apache.hadoop.mapred.JobStatus;
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hdt.core.Activator;
+import org.apache.hdt.core.HadoopVersion;
 import org.apache.hdt.core.launch.AbstractHadoopCluster;
 import org.apache.hdt.core.launch.ConfProp;
 import org.apache.hdt.core.launch.IHadoopJob;
@@ -64,12 +60,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.SAXException;
 
 /**
  * Representation of a Hadoop location, meaning of the master node (NameNode,
@@ -543,7 +533,15 @@ public class HadoopCluster extends AbstractHadoopCluster {
 	 * @see org.apache.hdt.core.launch.AbstractHadoopCluster#getVersion()
 	 */
 	@Override
-	public String getVersion() {
-		return "1.1";
+	public HadoopVersion getVersion() {
+		return HadoopVersion.Version1;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.apache.hdt.core.launch.AbstractHadoopCluster#getUIConfigurationBuilder()
+	 */
+	@Override
+	public HadoopConfigurationBuilder getUIConfigurationBuilder() {
+		return new HadoopV1ConfigurationBuilder(this);
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopV1ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopV1ConfigurationBuilder.java b/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopV1ConfigurationBuilder.java
new file mode 100644
index 0000000..fb5eace
--- /dev/null
+++ b/org.apache.hdt.hadoop.release/src/org/apache/hdt/hadoop/release/HadoopV1ConfigurationBuilder.java
@@ -0,0 +1,690 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hdt.hadoop.release;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.apache.hdt.core.launch.AbstractHadoopCluster;
+import org.apache.hdt.core.launch.AbstractHadoopCluster.ChangeListener;
+import org.apache.hdt.core.launch.AbstractHadoopCluster.HadoopConfigurationBuilder;
+import org.apache.hdt.core.launch.ConfProp;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Text;
+
+class HadoopV1ConfigurationBuilder implements HadoopConfigurationBuilder {
+
+	private AbstractHadoopCluster location;
+	private TabMediator mediator;
+	private ChangeListener changelistener;
+
+	public HadoopV1ConfigurationBuilder(AbstractHadoopCluster location) {
+		this.location = location;
+	}
+	@Override
+	public void buildControl(Composite panel) {
+		mediator = new TabMediator(panel);
+		GridData gdata = new GridData(GridData.FILL_BOTH);
+		gdata.horizontalSpan = 2;
+		mediator.folder.setLayoutData(gdata);
+	}
+
+
+	private class TabMediator {
+		TabFolder folder;
+		private Set<ChangeListener> tabs = new HashSet<ChangeListener>();
+
+		TabMediator(Composite parent) {
+			folder = new TabFolder(parent, SWT.NONE);
+			tabs.add(new TabMain(this));
+			tabs.add(new TabAdvanced(this));
+		}
+
+		/**
+		 * Implements change notifications from any tab: update the location
+		 * state and other tabs
+		 * 
+		 * @param source
+		 *            origin of the notification (one of the tree tabs)
+		 * @param propName
+		 *            modified property
+		 * @param propValue
+		 *            new value
+		 */
+		void notifyChange(ChangeListener source, final ConfProp prop, final String propValue) {
+			// Ignore notification when no change
+			String oldValue = location.getConfPropValue(prop);
+			if ((oldValue != null) && oldValue.equals(propValue))
+				return;
+
+			location.setConfPropValue(prop, propValue);
+			changelistener.notifyChange(prop, propValue);
+			this.fireChange(source, prop, propValue);
+
+			/*
+			 * Now we deal with dependencies between settings
+			 */
+			final String jobTrackerHost = location.getConfPropValue(ConfProp.PI_JOB_TRACKER_HOST);
+			final String jobTrackerPort = location.getConfPropValue(ConfProp.PI_JOB_TRACKER_PORT);
+			final String nameNodeHost = location.getConfPropValue(ConfProp.PI_NAME_NODE_HOST);
+			final String nameNodePort = location.getConfPropValue(ConfProp.PI_NAME_NODE_PORT);
+			final boolean colocate = location.getConfPropValue(ConfProp.PI_COLOCATE_MASTERS).equalsIgnoreCase("yes");
+			final String jobTrackerURI = location.getConfPropValue(ConfProp.JOB_TRACKER_URI);
+			final String fsDefaultURI = location.getConfPropValue(ConfProp.FS_DEFAULT_URI);
+			final String socksServerURI = location.getConfPropValue(ConfProp.SOCKS_SERVER);
+			final boolean socksProxyEnable = location.getConfPropValue(ConfProp.PI_SOCKS_PROXY_ENABLE).equalsIgnoreCase("yes");
+			final String socksProxyHost = location.getConfPropValue(ConfProp.PI_SOCKS_PROXY_HOST);
+			final String socksProxyPort = location.getConfPropValue(ConfProp.PI_SOCKS_PROXY_PORT);
+
+			Display.getDefault().syncExec(new Runnable() {
+				public void run() {
+					switch (prop) {
+					case PI_JOB_TRACKER_HOST: {
+						if (colocate)
+							notifyChange(null, ConfProp.PI_NAME_NODE_HOST, jobTrackerHost);
+						String newJobTrackerURI = String.format("%s:%s", jobTrackerHost, jobTrackerPort);
+						notifyChange(null, ConfProp.JOB_TRACKER_URI, newJobTrackerURI);
+						break;
+					}
+					case PI_JOB_TRACKER_PORT: {
+						String newJobTrackerURI = String.format("%s:%s", jobTrackerHost, jobTrackerPort);
+						notifyChange(null, ConfProp.JOB_TRACKER_URI, newJobTrackerURI);
+						break;
+					}
+					case PI_NAME_NODE_HOST: {
+						String newHDFSURI = String.format("hdfs://%s:%s/", nameNodeHost, nameNodePort);
+						notifyChange(null, ConfProp.FS_DEFAULT_URI, newHDFSURI);
+
+						// Break colocation if someone force the DFS Master
+						if (!colocate && !nameNodeHost.equals(jobTrackerHost))
+							notifyChange(null, ConfProp.PI_COLOCATE_MASTERS, "no");
+						break;
+					}
+					case PI_NAME_NODE_PORT: {
+						String newHDFSURI = String.format("hdfs://%s:%s/", nameNodeHost, nameNodePort);
+						notifyChange(null, ConfProp.FS_DEFAULT_URI, newHDFSURI);
+						break;
+					}
+					case PI_SOCKS_PROXY_HOST: {
+						String newSocksProxyURI = String.format("%s:%s", socksProxyHost, socksProxyPort);
+						notifyChange(null, ConfProp.SOCKS_SERVER, newSocksProxyURI);
+						break;
+					}
+					case PI_SOCKS_PROXY_PORT: {
+						String newSocksProxyURI = String.format("%s:%s", socksProxyHost, socksProxyPort);
+						notifyChange(null, ConfProp.SOCKS_SERVER, newSocksProxyURI);
+						break;
+					}
+					case JOB_TRACKER_URI: {
+						String[] strs = jobTrackerURI.split(":", 2);
+						String host = strs[0];
+						String port = (strs.length == 2) ? strs[1] : "";
+						notifyChange(null, ConfProp.PI_JOB_TRACKER_HOST, host);
+						notifyChange(null, ConfProp.PI_JOB_TRACKER_PORT, port);
+						break;
+					}
+					case FS_DEFAULT_URI: {
+						try {
+							URI uri = new URI(fsDefaultURI);
+							if (uri.getScheme().equals("hdfs")) {
+								String host = uri.getHost();
+								String port = Integer.toString(uri.getPort());
+								notifyChange(null, ConfProp.PI_NAME_NODE_HOST, host);
+								notifyChange(null, ConfProp.PI_NAME_NODE_PORT, port);
+							}
+						} catch (URISyntaxException use) {
+							// Ignore the update!
+						}
+						break;
+					}
+					case SOCKS_SERVER: {
+						String[] strs = socksServerURI.split(":", 2);
+						String host = strs[0];
+						String port = (strs.length == 2) ? strs[1] : "";
+						notifyChange(null, ConfProp.PI_SOCKS_PROXY_HOST, host);
+						notifyChange(null, ConfProp.PI_SOCKS_PROXY_PORT, port);
+						break;
+					}
+					case PI_COLOCATE_MASTERS: {
+						if (colocate)
+							notifyChange(null, ConfProp.PI_NAME_NODE_HOST, jobTrackerHost);
+						break;
+					}
+					case PI_SOCKS_PROXY_ENABLE: {
+						if (socksProxyEnable) {
+							notifyChange(null, ConfProp.SOCKET_FACTORY_DEFAULT, "org.apache.hadoop.net.SocksSocketFactory");
+						} else {
+							notifyChange(null, ConfProp.SOCKET_FACTORY_DEFAULT, "org.apache.hadoop.net.StandardSocketFactory");
+						}
+						break;
+					}
+					}
+				}
+			});
+
+		}
+
+		/**
+		 * Change notifications on properties (by name). A property might not be
+		 * reflected as a ConfProp enum. If it is, the notification is forwarded
+		 * to the ConfProp notifyChange method. If not, it is processed here.
+		 * 
+		 * @param source
+		 * @param propName
+		 * @param propValue
+		 */
+		void notifyChange(ChangeListener source, String propName, String propValue) {
+			ConfProp prop = location.getConfPropForName(propName);
+			if (prop != null)
+				notifyChange(source, prop, propValue);
+			else
+				location.setConfPropValue(propName, propValue);
+		}
+
+		/**
+		 * Broadcast a property change to all registered tabs. If a tab is
+		 * identified as the source of the change, this tab will not be
+		 * notified.
+		 * 
+		 * @param source
+		 *            TODO
+		 * @param prop
+		 * @param value
+		 */
+		private void fireChange(ChangeListener source, ConfProp prop, String value) {
+			for (ChangeListener tab : tabs) {
+				if (tab != source)
+					tab.notifyChange(prop, value);
+			}
+		}
+
+	}
+
+	/**
+	 * Create a SWT Text component for the given {@link ConfProp} text
+	 * configuration property.
+	 * 
+	 * @param listener
+	 * @param parent
+	 * @param prop
+	 * @return
+	 */
+	private Text createConfText(ModifyListener listener, Composite parent, ConfProp prop) {
+		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
+		GridData data = new GridData(GridData.FILL_HORIZONTAL);
+		text.setLayoutData(data);
+		text.setData("hProp", prop);
+		text.setText(location.getConfPropValue(prop));
+		text.addModifyListener(listener);
+		return text;
+	}
+
+	/**
+	 * Create a SWT Checked Button component for the given {@link ConfProp}
+	 * boolean configuration property.
+	 * 
+	 * @param listener
+	 * @param parent
+	 * @param prop
+	 * @return
+	 */
+	private Button createConfCheckButton(SelectionListener listener, Composite parent, ConfProp prop, String text) {
+		Button button = new Button(parent, SWT.CHECK);
+		button.setText(text);
+		button.setData("hProp", prop);
+		button.setSelection(location.getConfPropValue(prop).equalsIgnoreCase("yes"));
+		button.addSelectionListener(listener);
+		return button;
+	}
+
+	/**
+	 * Create editor entry for the given configuration property. The editor is a
+	 * couple (Label, Text).
+	 * 
+	 * @param listener
+	 *            the listener to trigger on property change
+	 * @param parent
+	 *            the SWT parent container
+	 * @param prop
+	 *            the property to create an editor for
+	 * @param labelText
+	 *            a label (null will defaults to the property name)
+	 * 
+	 * @return a SWT Text field
+	 */
+	private Text createConfLabelText(ModifyListener listener, Composite parent, ConfProp prop, String labelText) {
+		Label label = new Label(parent, SWT.NONE);
+		if (labelText == null)
+			labelText = location.getConfPropName(prop);
+		label.setText(labelText);
+		return createConfText(listener, parent, prop);
+	}
+
+	/**
+	 * Create an editor entry for the given configuration name
+	 * 
+	 * @param listener
+	 *            the listener to trigger on property change
+	 * @param parent
+	 *            the SWT parent container
+	 * @param propName
+	 *            the name of the property to create an editor for
+	 * @param labelText
+	 *            a label (null will defaults to the property name)
+	 * 
+	 * @return a SWT Text field
+	 */
+	private Text createConfNameEditor(ModifyListener listener, Composite parent, String propName, String labelText) {
+
+		{
+			ConfProp prop = location.getConfPropForName(propName);
+			if (prop != null)
+				return createConfLabelText(listener, parent, prop, labelText);
+		}
+
+		Label label = new Label(parent, SWT.NONE);
+		if (labelText == null)
+			labelText = propName;
+		label.setText(labelText);
+
+		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
+		GridData data = new GridData(GridData.FILL_HORIZONTAL);
+		text.setLayoutData(data);
+		text.setData("hPropName", propName);
+		text.setText(location.getConfPropValue(propName));
+		text.addModifyListener(listener);
+
+		return text;
+	}
+
+	/**
+	 * Main parameters of the Hadoop location: <li>host and port of the
+	 * Map/Reduce master (Job tracker) <li>host and port of the DFS master (Name
+	 * node) <li>SOCKS proxy
+	 */
+	private class TabMain implements ChangeListener, ModifyListener, SelectionListener {
+
+		TabMediator mediator;
+
+		Text textJTHost;
+
+		Text textNNHost;
+
+		Button colocateMasters;
+
+		Text textJTPort;
+
+		Text textNNPort;
+
+		Text userName;
+
+		Button useSocksProxy;
+
+		Text socksProxyHost;
+
+		Text socksProxyPort;
+
+		private Group groupMR;
+
+		TabMain(TabMediator mediator) {
+			this.mediator = mediator;
+			TabItem tab = new TabItem(mediator.folder, SWT.NONE);
+			tab.setText("General");
+			tab.setToolTipText("General location parameters");
+			tab.setControl(createControl(mediator.folder));
+		}
+
+		private Control createControl(Composite parent) {
+
+			Composite panel = new Composite(parent, SWT.FILL);
+			panel.setLayout(new GridLayout(2, false));
+
+			GridData data;
+
+			/*
+			 * Map/Reduce group
+			 */
+			{
+				groupMR = new Group(panel, SWT.SHADOW_NONE);
+				groupMR.setText("Map/Reduce Master Node");
+				groupMR.setToolTipText("Address of the Map/Reduce Master node.");
+				GridLayout layout = new GridLayout(2, false);
+				groupMR.setLayout(layout);
+				data = new GridData();
+				data.verticalAlignment = SWT.FILL;
+				data.horizontalAlignment = SWT.CENTER;
+				data.widthHint = 250;
+				groupMR.setLayoutData(data);
+
+				// Job Tracker host
+				Label label = new Label(groupMR, SWT.NONE);
+				label.setText("Host:");
+				data = new GridData(GridData.BEGINNING, GridData.CENTER, false, true);
+				label.setLayoutData(data);
+
+				textJTHost = createConfText(this, groupMR, ConfProp.PI_JOB_TRACKER_HOST);
+				data = new GridData(GridData.FILL, GridData.CENTER, true, true);
+				textJTHost.setLayoutData(data);
+
+				// Job Tracker port
+				label = new Label(groupMR, SWT.NONE);
+				label.setText("Port:");
+				data = new GridData(GridData.BEGINNING, GridData.CENTER, false, true);
+				label.setLayoutData(data);
+
+				textJTPort = createConfText(this, groupMR, ConfProp.PI_JOB_TRACKER_PORT);
+				data = new GridData(GridData.FILL, GridData.CENTER, true, true);
+				textJTPort.setLayoutData(data);
+			}
+
+			/*
+			 * DFS group
+			 */
+			{
+				Group groupDFS = new Group(panel, SWT.SHADOW_NONE);
+				groupDFS.setText("DFS Master");
+				groupDFS.setToolTipText("Address of the Distributed FileSystem " + "master node (the Name Node).");
+				GridLayout layout = new GridLayout(2, false);
+				groupDFS.setLayout(layout);
+				data = new GridData();
+				data.horizontalAlignment = SWT.CENTER;
+				data.widthHint = 250;
+				groupDFS.setLayoutData(data);
+
+				colocateMasters = createConfCheckButton(this, groupDFS, ConfProp.PI_COLOCATE_MASTERS, "Use M/R Master host");
+				data = new GridData();
+				data.horizontalSpan = 2;
+				colocateMasters.setLayoutData(data);
+
+				// Job Tracker host
+				Label label = new Label(groupDFS, SWT.NONE);
+				data = new GridData();
+				label.setText("Host:");
+				label.setLayoutData(data);
+
+				textNNHost = createConfText(this, groupDFS, ConfProp.PI_NAME_NODE_HOST);
+
+				// Job Tracker port
+				label = new Label(groupDFS, SWT.NONE);
+				data = new GridData();
+				label.setText("Port:");
+				label.setLayoutData(data);
+
+				textNNPort = createConfText(this, groupDFS, ConfProp.PI_NAME_NODE_PORT);
+			}
+
+			{
+				Composite subpanel = new Composite(panel, SWT.FILL);
+				subpanel.setLayout(new GridLayout(2, false));
+				data = new GridData();
+				data.horizontalSpan = 2;
+				data.horizontalAlignment = SWT.FILL;
+				subpanel.setLayoutData(data);
+
+				userName = createConfLabelText(this, subpanel, ConfProp.PI_USER_NAME, "&User name:");
+			}
+
+			// SOCKS proxy group
+			{
+				Group groupSOCKS = new Group(panel, SWT.SHADOW_NONE);
+				groupSOCKS.setText("SOCKS proxy");
+				groupSOCKS.setToolTipText("Address of the SOCKS proxy to use " + "to connect to the infrastructure.");
+				GridLayout layout = new GridLayout(2, false);
+				groupSOCKS.setLayout(layout);
+				data = new GridData();
+				data.horizontalAlignment = SWT.CENTER;
+				data.horizontalSpan = 2;
+				data.widthHint = 250;
+				groupSOCKS.setLayoutData(data);
+
+				useSocksProxy = createConfCheckButton(this, groupSOCKS, ConfProp.PI_SOCKS_PROXY_ENABLE, "Enable SOCKS proxy");
+				data = new GridData();
+				data.horizontalSpan = 2;
+				useSocksProxy.setLayoutData(data);
+
+				// SOCKS proxy host
+				Label label = new Label(groupSOCKS, SWT.NONE);
+				data = new GridData();
+				label.setText("Host:");
+				label.setLayoutData(data);
+
+				socksProxyHost = createConfText(this, groupSOCKS, ConfProp.PI_SOCKS_PROXY_HOST);
+
+				// SOCKS proxy port
+				label = new Label(groupSOCKS, SWT.NONE);
+				data = new GridData();
+				label.setText("Port:");
+				label.setLayoutData(data);
+
+				socksProxyPort = createConfText(this, groupSOCKS, ConfProp.PI_SOCKS_PROXY_PORT);
+			}
+
+			// Update the state of all widgets according to the current values!
+			reloadConfProp(ConfProp.PI_COLOCATE_MASTERS);
+			reloadConfProp(ConfProp.PI_SOCKS_PROXY_ENABLE);
+			reloadConfProp(ConfProp.PI_HADOOP_VERSION);
+
+			return panel;
+		}
+
+		/**
+		 * Reload the given configuration property value
+		 * 
+		 * @param prop
+		 */
+		private void reloadConfProp(ConfProp prop) {
+			this.notifyChange(prop, location.getConfPropValue(prop));
+		}
+
+		public void notifyChange(ConfProp prop, String propValue) {
+			switch (prop) {
+			case PI_JOB_TRACKER_HOST: {
+				textJTHost.setText(propValue);
+				break;
+			}
+			case PI_JOB_TRACKER_PORT: {
+				textJTPort.setText(propValue);
+				break;
+			}
+			case PI_USER_NAME: {
+				userName.setText(propValue);
+				break;
+			}
+			case PI_COLOCATE_MASTERS: {
+				if (colocateMasters != null) {
+					boolean colocate = propValue.equalsIgnoreCase("yes");
+					colocateMasters.setSelection(colocate);
+					if (textNNHost != null) {
+						textNNHost.setEnabled(!colocate);
+					}
+				}
+				break;
+			}
+			case PI_NAME_NODE_HOST: {
+				textNNHost.setText(propValue);
+				break;
+			}
+			case PI_NAME_NODE_PORT: {
+				textNNPort.setText(propValue);
+				break;
+			}
+			case PI_SOCKS_PROXY_ENABLE: {
+				if (useSocksProxy != null) {
+					boolean useProxy = propValue.equalsIgnoreCase("yes");
+					useSocksProxy.setSelection(useProxy);
+					if (socksProxyHost != null)
+						socksProxyHost.setEnabled(useProxy);
+					if (socksProxyPort != null)
+						socksProxyPort.setEnabled(useProxy);
+				}
+				break;
+			}
+			case PI_SOCKS_PROXY_HOST: {
+				socksProxyHost.setText(propValue);
+				break;
+			}
+			case PI_SOCKS_PROXY_PORT: {
+				socksProxyPort.setText(propValue);
+				break;
+			}
+			}
+		}
+
+		/* @inheritDoc */
+		public void modifyText(ModifyEvent e) {
+			final Text text = (Text) e.widget;
+			final ConfProp prop = (ConfProp) text.getData("hProp");
+			Display.getDefault().syncExec(new Runnable() {
+				public void run() {
+					mediator.notifyChange(TabMain.this, prop, text.getText());
+				}
+			});
+		}
+
+		/* @inheritDoc */
+		public void widgetDefaultSelected(SelectionEvent e) {
+			this.widgetSelected(e);
+		}
+
+		/* @inheritDoc */
+		public void widgetSelected(SelectionEvent e) {
+			final Button button = (Button) e.widget;
+			final ConfProp prop = (ConfProp) button.getData("hProp");
+
+			Display.getDefault().syncExec(new Runnable() {
+				public void run() {
+					// We want to receive the update also!
+					mediator.notifyChange(null, prop, button.getSelection() ? "yes" : "no");
+				}
+			});
+		}
+
+	}
+
+	private class TabAdvanced implements ChangeListener, ModifyListener {
+		TabMediator mediator;
+		private Composite panel;
+		private Map<String, Text> textMap = new TreeMap<String, Text>();
+
+		TabAdvanced(TabMediator mediator) {
+			this.mediator = mediator;
+			TabItem tab = new TabItem(mediator.folder, SWT.NONE);
+			tab.setText("Advanced parameters");
+			tab.setToolTipText("Access to advanced Hadoop parameters");
+			tab.setControl(createControl(mediator.folder));
+
+		}
+
+		private Control createControl(Composite parent) {
+			ScrolledComposite sc = new ScrolledComposite(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+			panel = buildPanel(sc);
+			sc.setContent(panel);
+			sc.setExpandHorizontal(true);
+			sc.setExpandVertical(true);
+			sc.setMinSize(640, 480);
+			sc.setMinSize(panel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+			return sc;
+		}
+
+		private Composite buildPanel(Composite parent) {
+			Composite panel = new Composite(parent, SWT.NONE);
+			GridLayout layout = new GridLayout();
+			layout.numColumns = 2;
+			layout.makeColumnsEqualWidth = false;
+			panel.setLayout(layout);
+			panel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
+
+			// Sort by property name
+			SortedMap<String, String> map = new TreeMap<String, String>();
+			Iterator<Entry<String, String>> it = location.getConfiguration();
+			while (it.hasNext()) {
+				Entry<String, String> entry = it.next();
+				map.put(entry.getKey(), entry.getValue());
+			}
+
+			for (Entry<String, String> entry : map.entrySet()) {
+				Text text = createConfNameEditor(this, panel, entry.getKey(), null);
+				textMap.put(entry.getKey(), text);
+			}
+			return panel;
+		}
+
+		public void notifyChange(ConfProp prop, final String propValue) {
+			Text text = textMap.get(location.getConfPropName(prop));
+			text.setText(propValue);
+		}
+
+		public void modifyText(ModifyEvent e) {
+			final Text text = (Text) e.widget;
+			Object hProp = text.getData("hProp");
+			final ConfProp prop = (hProp != null) ? (ConfProp) hProp : null;
+			Object hPropName = text.getData("hPropName");
+			final String propName = (hPropName != null) ? (String) hPropName : null;
+
+			Display.getDefault().syncExec(new Runnable() {
+				public void run() {
+					if (prop != null)
+						mediator.notifyChange(TabAdvanced.this, prop, text.getText());
+					else
+						mediator.notifyChange(TabAdvanced.this, propName, text.getText());
+				}
+			});
+		}
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.apache.hdt.core.launch.AbstractHadoopCluster.HadoopConfigurationBuilder#update(org.apache.hdt.core.launch.ConfProp, java.lang.String)
+	 */
+	@Override
+	public void notifyChange(ConfProp confProp, String text) {
+		mediator.notifyChange(null, ConfProp.PI_LOCATION_NAME, text);
+		
+	}
+	/* (non-Javadoc)
+	 * @see org.apache.hdt.core.launch.AbstractHadoopCluster.HadoopConfigurationBuilder#setChangeListener(org.apache.hdt.core.launch.AbstractHadoopCluster.ChangeListener)
+	 */
+	@Override
+	public void setChangeListener(ChangeListener l) {
+		changelistener=l;
+	}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopCluster.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopCluster.java b/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopCluster.java
index 56f1880..cf4dcd4 100644
--- a/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopCluster.java
+++ b/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopCluster.java
@@ -38,10 +38,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.IOUtils;
@@ -50,8 +46,8 @@ import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.JobID;
 import org.apache.hadoop.mapred.JobStatus;
 import org.apache.hadoop.mapred.RunningJob;
-import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hdt.core.Activator;
+import org.apache.hdt.core.HadoopVersion;
 import org.apache.hdt.core.launch.AbstractHadoopCluster;
 import org.apache.hdt.core.launch.ConfProp;
 import org.apache.hdt.core.launch.IHadoopJob;
@@ -63,12 +59,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.SAXException;
 
 /**
  * Representation of a Hadoop location, meaning of the master node (NameNode,
@@ -242,9 +232,6 @@ public class HadoopCluster extends AbstractHadoopCluster {
             this.conf = new Configuration();
             this.addPluginConfigDefaultProperties();
             conf.set("mapreduce.framework.name", "yarn");
-            conf.set(YarnConfiguration.RM_ADDRESS, "localhost:8032");
-            conf.set(getConfPropName(ConfProp.PI_JOB_TRACKER_PORT), "8032");
-            conf.set("mapreduce.jobhistory.address", "localhost:10020");
         }
    
 	/**
@@ -341,7 +328,7 @@ public class HadoopCluster extends AbstractHadoopCluster {
 	 * @return the host name of the Job tracker
 	 */
 	public String getMasterHostName() {
-		return getConfPropValue(ConfProp.PI_JOB_TRACKER_HOST);
+		return getConfPropValue(ConfProp.PI_RESOURCE_MGR_HOST);
 	}
 
 	public String getState() {
@@ -393,21 +380,6 @@ public class HadoopCluster extends AbstractHadoopCluster {
 		setConfPropValue(ConfProp.PI_LOCATION_NAME, newName);
 	}
     
-	@Override
-	public String getConfPropName(ConfProp prop) {
-	    if(ConfProp.JOB_TRACKER_URI.equals(prop))
-	        return YarnConfiguration.RM_ADDRESS;
-	    return super.getConfPropName(prop);
-	}
-        @Override
-        public ConfProp getConfPropForName(String propName) {
-            if(YarnConfiguration.RM_ADDRESS.equals(propName))
-                return ConfProp.JOB_TRACKER_URI;
-            if("mapred.job.tracker".equals(propName))
-                return null;
-            return super.getConfPropForName(propName);
-        }
-    
 	/**
 	 * Write this location settings to the given output stream
 	 * 
@@ -553,7 +525,13 @@ public class HadoopCluster extends AbstractHadoopCluster {
 	}
 
     @Override
-    public String getVersion() {
-        return "2.2";
+    public HadoopVersion getVersion() {
+            return HadoopVersion.Version2;
+    }
+
+
+    @Override
+    public HadoopConfigurationBuilder getUIConfigurationBuilder() {
+        return new HadoopV2ConfigurationBuilder(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopV2ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopV2ConfigurationBuilder.java b/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopV2ConfigurationBuilder.java
new file mode 100644
index 0000000..02f05c4
--- /dev/null
+++ b/org.apache.hdt.hadoop2.release/src/org/apache/hdt/hadoop2/release/HadoopV2ConfigurationBuilder.java
@@ -0,0 +1,771 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hdt.hadoop2.release;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.apache.hdt.core.launch.AbstractHadoopCluster;
+import org.apache.hdt.core.launch.AbstractHadoopCluster.ChangeListener;
+import org.apache.hdt.core.launch.AbstractHadoopCluster.HadoopConfigurationBuilder;
+import org.apache.hdt.core.launch.ConfProp;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Text;
+
+class HadoopV2ConfigurationBuilder implements HadoopConfigurationBuilder {
+
+    private AbstractHadoopCluster location;
+    private TabMediator mediator;
+    private ChangeListener changelistener;
+
+    public HadoopV2ConfigurationBuilder(AbstractHadoopCluster location) {
+        this.location = location;
+    }
+
+    @Override
+    public void buildControl(Composite panel) {
+        mediator = new TabMediator(panel);
+        GridData gdata = new GridData(GridData.FILL_BOTH);
+        gdata.horizontalSpan = 2;
+        mediator.folder.setLayoutData(gdata);
+    }
+
+    private interface TabListener {
+        void notifyChange(ConfProp prop, String propValue);
+    }
+
+    private class TabMediator {
+        TabFolder folder;
+        private Set<TabListener> tabs = new HashSet<TabListener>();
+
+        TabMediator(Composite parent) {
+            folder = new TabFolder(parent, SWT.NONE);
+            tabs.add(new TabMain(this));
+            tabs.add(new TabAdvanced(this));
+        }
+
+        /**
+         * Implements change notifications from any tab: update the
+         * location state and other tabs
+         * 
+         * @param source
+         *            origin of the notification (one of the tree tabs)
+         * @param propName
+         *            modified property
+         * @param propValue
+         *            new value
+         */
+        void notifyChange(TabListener source, final ConfProp prop, final String propValue) {
+            // Ignore notification when no change
+            String oldValue = location.getConfPropValue(prop);
+            if ((oldValue != null) && oldValue.equals(propValue))
+                return;
+
+            location.setConfPropValue(prop, propValue);
+            changelistener.notifyChange(prop, propValue);
+
+            this.fireChange(source, prop, propValue);
+
+            /*
+             * Now we deal with dependencies between settings
+             */
+            final String rmHost = location.getConfPropValue(ConfProp.PI_RESOURCE_MGR_HOST);
+            final String rmPort = location.getConfPropValue(ConfProp.PI_RESOURCE_MGR_PORT);
+            final String jhHost = location.getConfPropValue(ConfProp.PI_JOB_HISTORY_HOST);
+            final String jhPort = location.getConfPropValue(ConfProp.PI_JOB_HISTORY_PORT);
+            final String nameNodeHost = location.getConfPropValue(ConfProp.PI_NAME_NODE_HOST);
+            final String nameNodePort = location.getConfPropValue(ConfProp.PI_NAME_NODE_PORT);
+            final boolean colocate = location.getConfPropValue(ConfProp.PI_COLOCATE_MASTERS).equalsIgnoreCase("yes");
+            final String rmDefaultURI = location.getConfPropValue(ConfProp.RM_DEFAULT_URI);
+            final String jhDefaultURI = location.getConfPropValue(ConfProp.JOB_HISTORY_DEFAULT_URI);
+            final String fsDefaultURI = location.getConfPropValue(ConfProp.FS_DEFAULT_URI);
+            final String socksServerURI = location.getConfPropValue(ConfProp.SOCKS_SERVER);
+            final boolean socksProxyEnable = location.getConfPropValue(ConfProp.PI_SOCKS_PROXY_ENABLE).equalsIgnoreCase("yes");
+            final String socksProxyHost = location.getConfPropValue(ConfProp.PI_SOCKS_PROXY_HOST);
+            final String socksProxyPort = location.getConfPropValue(ConfProp.PI_SOCKS_PROXY_PORT);
+
+            Display.getDefault().syncExec(new Runnable() {
+                public void run() {
+                    switch (prop) {
+                    case PI_RESOURCE_MGR_HOST: {
+                        if (colocate) {
+                            notifyChange(null, ConfProp.PI_NAME_NODE_HOST, rmHost);
+                            notifyChange(null, ConfProp.PI_JOB_HISTORY_HOST, rmHost);
+                        }
+                        String newJobTrackerURI = String.format("%s:%s", rmHost, rmPort);
+                        notifyChange(null, ConfProp.RM_DEFAULT_URI, newJobTrackerURI);
+                        break;
+                    }
+                    case PI_RESOURCE_MGR_PORT: {
+                        String newJobTrackerURI = String.format("%s:%s", rmHost, rmPort);
+                        notifyChange(null, ConfProp.RM_DEFAULT_URI, newJobTrackerURI);
+                        break;
+                    }
+                    case PI_NAME_NODE_HOST: {
+                        String newHDFSURI = String.format("hdfs://%s:%s/", nameNodeHost, nameNodePort);
+                        notifyChange(null, ConfProp.FS_DEFAULT_URI, newHDFSURI);
+
+                        // Break colocation if someone force the DFS Master
+                        if (!colocate && !nameNodeHost.equals(rmHost))
+                            notifyChange(null, ConfProp.PI_COLOCATE_MASTERS, "no");
+                        break;
+                    }
+                    case PI_NAME_NODE_PORT: {
+                        String newHDFSURI = String.format("hdfs://%s:%s/", nameNodeHost, nameNodePort);
+                        notifyChange(null, ConfProp.FS_DEFAULT_URI, newHDFSURI);
+                        break;
+                    }
+
+                    case PI_JOB_HISTORY_HOST: {
+                        String newJobHistoryURI = String.format("%s:%s", jhHost, jhPort);
+                        notifyChange(null, ConfProp.JOB_HISTORY_DEFAULT_URI, newJobHistoryURI);
+
+                        // Break colocation if someone force the DFS Master
+                        if (!colocate && !nameNodeHost.equals(rmHost))
+                            notifyChange(null, ConfProp.PI_COLOCATE_MASTERS, "no");
+                        break;
+                    }
+                    case PI_JOB_HISTORY_PORT: {
+                        String newJobHistoryURI = String.format("%s:%s", jhHost, jhPort);
+                        notifyChange(null, ConfProp.JOB_HISTORY_DEFAULT_URI, newJobHistoryURI);
+                        break;
+                    }
+
+                    case PI_SOCKS_PROXY_HOST: {
+                        String newSocksProxyURI = String.format("%s:%s", socksProxyHost, socksProxyPort);
+                        notifyChange(null, ConfProp.SOCKS_SERVER, newSocksProxyURI);
+                        break;
+                    }
+                    case PI_SOCKS_PROXY_PORT: {
+                        String newSocksProxyURI = String.format("%s:%s", socksProxyHost, socksProxyPort);
+                        notifyChange(null, ConfProp.SOCKS_SERVER, newSocksProxyURI);
+                        break;
+                    }
+                    case RM_DEFAULT_URI: {
+                        String[] strs = rmDefaultURI.split(":", 2);
+                        String host = strs[0];
+                        String port = (strs.length == 2) ? strs[1] : "";
+                        notifyChange(null, ConfProp.PI_RESOURCE_MGR_HOST, host);
+                        notifyChange(null, ConfProp.PI_RESOURCE_MGR_PORT, port);
+                        break;
+                    }
+                    case JOB_HISTORY_DEFAULT_URI: {
+                        String[] strs = jhDefaultURI.split(":", 2);
+                        String host = strs[0];
+                        String port = (strs.length == 2) ? strs[1] : "";
+                        notifyChange(null, ConfProp.PI_JOB_HISTORY_HOST, host);
+                        notifyChange(null, ConfProp.PI_JOB_HISTORY_PORT, port);
+                        break;
+                    }
+                    case FS_DEFAULT_URI: {
+                        try {
+                            URI uri = new URI(fsDefaultURI);
+                            if (uri.getScheme().equals("hdfs")) {
+                                String host = uri.getHost();
+                                String port = Integer.toString(uri.getPort());
+                                notifyChange(null, ConfProp.PI_NAME_NODE_HOST, host);
+                                notifyChange(null, ConfProp.PI_NAME_NODE_PORT, port);
+                            }
+                        } catch (URISyntaxException use) {
+                            // Ignore the update!
+                        }
+                        break;
+                    }
+                    case SOCKS_SERVER: {
+                        String[] strs = socksServerURI.split(":", 2);
+                        String host = strs[0];
+                        String port = (strs.length == 2) ? strs[1] : "";
+                        notifyChange(null, ConfProp.PI_SOCKS_PROXY_HOST, host);
+                        notifyChange(null, ConfProp.PI_SOCKS_PROXY_PORT, port);
+                        break;
+                    }
+                    case PI_COLOCATE_MASTERS: {
+                        if (colocate) {
+                            notifyChange(null, ConfProp.PI_NAME_NODE_HOST, rmHost);
+                            notifyChange(null, ConfProp.PI_JOB_HISTORY_HOST, rmHost);
+                        }
+                        break;
+                    }
+                    case PI_SOCKS_PROXY_ENABLE: {
+                        if (socksProxyEnable) {
+                            notifyChange(null, ConfProp.SOCKET_FACTORY_DEFAULT, "org.apache.hadoop.net.SocksSocketFactory");
+                        } else {
+                            notifyChange(null, ConfProp.SOCKET_FACTORY_DEFAULT, "org.apache.hadoop.net.StandardSocketFactory");
+                        }
+                        break;
+                    }
+                    }
+                }
+            });
+
+        }
+
+        /**
+         * Change notifications on properties (by name). A property might
+         * not be reflected as a ConfProp enum. If it is, the notification
+         * is forwarded to the ConfProp notifyChange method. If not, it is
+         * processed here.
+         * 
+         * @param source
+         * @param propName
+         * @param propValue
+         */
+        void notifyChange(TabListener source, String propName, String propValue) {
+            ConfProp prop = location.getConfPropForName(propName);
+            if (prop != null)
+                notifyChange(source, prop, propValue);
+            else
+                location.setConfPropValue(propName, propValue);
+        }
+
+        /**
+         * Broadcast a property change to all registered tabs. If a tab is
+         * identified as the source of the change, this tab will not be
+         * notified.
+         * 
+         * @param source
+         *            TODO
+         * @param prop
+         * @param value
+         */
+        private void fireChange(TabListener source, ConfProp prop, String value) {
+            for (TabListener tab : tabs) {
+                if (tab != source)
+                    tab.notifyChange(prop, value);
+            }
+        }
+
+    }
+
+    /**
+     * Create a SWT Text component for the given {@link ConfProp} text
+     * configuration property.
+     * 
+     * @param listener
+     * @param parent
+     * @param prop
+     * @return
+     */
+    private Text createConfText(ModifyListener listener, Composite parent, ConfProp prop) {
+        Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
+        GridData data = new GridData(GridData.FILL_HORIZONTAL);
+        text.setLayoutData(data);
+        text.setData("hProp", prop);
+        text.setText(location.getConfPropValue(prop));
+        text.addModifyListener(listener);
+        return text;
+    }
+
+    /**
+     * Create a SWT Checked Button component for the given {@link ConfProp}
+     * boolean configuration property.
+     * 
+     * @param listener
+     * @param parent
+     * @param prop
+     * @return
+     */
+    private Button createConfCheckButton(SelectionListener listener, Composite parent, ConfProp prop, String text) {
+        Button button = new Button(parent, SWT.CHECK);
+        button.setText(text);
+        button.setData("hProp", prop);
+        button.setSelection(location.getConfPropValue(prop).equalsIgnoreCase("yes"));
+        button.addSelectionListener(listener);
+        return button;
+    }
+
+    /**
+     * Create editor entry for the given configuration property. The editor
+     * is a couple (Label, Text).
+     * 
+     * @param listener
+     *            the listener to trigger on property change
+     * @param parent
+     *            the SWT parent container
+     * @param prop
+     *            the property to create an editor for
+     * @param labelText
+     *            a label (null will defaults to the property name)
+     * 
+     * @return a SWT Text field
+     */
+    private Text createConfLabelText(ModifyListener listener, Composite parent, ConfProp prop, String labelText) {
+        Label label = new Label(parent, SWT.NONE);
+        if (labelText == null)
+            labelText = location.getConfPropName(prop);
+        label.setText(labelText);
+        return createConfText(listener, parent, prop);
+    }
+
+    /**
+     * Create an editor entry for the given configuration name
+     * 
+     * @param listener
+     *            the listener to trigger on property change
+     * @param parent
+     *            the SWT parent container
+     * @param propName
+     *            the name of the property to create an editor for
+     * @param labelTextRACKER_HOST
+     *            a label (null will defaults to the property name)
+     * 
+     * @return a SWT Text field
+     */
+    private Text createConfNameEditor(ModifyListener listener, Composite parent, String propName, String labelText) {
+
+        {
+            ConfProp prop = location.getConfPropForName(propName);
+            if (prop != null)
+                return createConfLabelText(listener, parent, prop, labelText);
+        }
+
+        Label label = new Label(parent, SWT.NONE);
+        if (labelText == null)
+            labelText = propName;
+        label.setText(labelText);
+
+        Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
+        GridData data = new GridData(GridData.FILL_HORIZONTAL);
+        text.setLayoutData(data);
+        text.setData("hPropName", propName);
+        text.setText(location.getConfPropValue(propName));
+        text.addModifyListener(listener);
+
+        return text;
+    }
+
+    /**
+     * Main parameters of the Hadoop location: <li>host and port of the
+     * Map/Reduce master (Job tracker) <li>host and port of the DFS master
+     * (Name node) <li>SOCKS proxy
+     */
+    private class TabMain implements TabListener, ModifyListener, SelectionListener {
+
+        TabMediator mediator;
+
+        Text textRMHost;
+
+        Text textNNHost;
+
+        Button colocateMasters;
+
+        Text textJTPort;
+
+        Text textNNPort;
+
+        Text userName;
+
+        Button useSocksProxy;
+
+        Text socksProxyHost;
+
+        Text socksProxyPort;
+
+        private Group groupMR;
+
+        private Text textJHHost;
+
+        private Text textJHPort;
+
+        TabMain(TabMediator mediator) {
+            this.mediator = mediator;
+            TabItem tab = new TabItem(mediator.folder, SWT.NONE);
+            tab.setText("General");
+            tab.setToolTipText("General location parameters");
+            tab.setControl(createControl(mediator.folder));
+        }
+
+        private Control createControl(Composite parent) {
+
+            Composite panel = new Composite(parent, SWT.FILL);
+            panel.setLayout(new GridLayout(2, false));
+
+            GridData data;
+
+            /*
+             * Map/Reduce group
+             */
+            {
+                groupMR = new Group(panel, SWT.SHADOW_NONE);
+                groupMR.setText("Resource Manager Node");
+                groupMR.setToolTipText("Address of the Resource Manager node.");
+                GridLayout layout = new GridLayout(2, false);
+                groupMR.setLayout(layout);
+                data = new GridData();
+                data.verticalAlignment = SWT.FILL;
+                data.horizontalAlignment = SWT.CENTER;
+                data.widthHint = 250;
+                groupMR.setLayoutData(data);
+
+                // Job Tracker host
+                Label label = new Label(groupMR, SWT.NONE);
+                label.setText("Host:");
+                data = new GridData(GridData.BEGINNING, GridData.CENTER, false, true);
+                label.setLayoutData(data);
+
+                textRMHost = createConfText(this, groupMR, ConfProp.PI_RESOURCE_MGR_HOST);
+                data = new GridData(GridData.FILL, GridData.CENTER, true, true);
+                textRMHost.setLayoutData(data);
+
+                colocateMasters = createConfCheckButton(this, groupMR, ConfProp.PI_COLOCATE_MASTERS, "Use RM host for other services.");
+                data = new GridData();
+                data.horizontalSpan = 2;
+                colocateMasters.setLayoutData(data);
+
+                // Job Tracker port
+                label = new Label(groupMR, SWT.NONE);
+                label.setText("Port:");
+                data = new GridData(GridData.BEGINNING, GridData.CENTER, false, true);
+                label.setLayoutData(data);
+
+                textJTPort = createConfText(this, groupMR, ConfProp.PI_RESOURCE_MGR_PORT);
+                data = new GridData(GridData.FILL, GridData.CENTER, true, true);
+                textJTPort.setLayoutData(data);
+            }
+
+            /*
+             * Job history Server
+             */
+            {
+                Group groupDFS = new Group(panel, SWT.SHADOW_NONE);
+                groupDFS.setText("Job History Node");
+                groupDFS.setToolTipText("Address of the Job Histroy Node.");
+                GridLayout layout = new GridLayout(2, false);
+                groupDFS.setLayout(layout);
+                data = new GridData();
+                data.horizontalAlignment = SWT.CENTER;
+                data.verticalAlignment = SWT.FILL;
+                data.widthHint = 250;
+                groupDFS.setLayoutData(data);
+
+                // Job Tracker host
+                Label label = new Label(groupDFS, SWT.NONE);
+                data = new GridData();
+                label.setText("Host:");
+                label.setLayoutData(data);
+
+                textJHHost = createConfText(this, groupDFS, ConfProp.PI_JOB_HISTORY_HOST);
+
+                // Job Tracker port
+                label = new Label(groupDFS, SWT.NONE);
+                data = new GridData();
+                label.setText("Port:");
+                label.setLayoutData(data);
+
+                textJHPort = createConfText(this, groupDFS, ConfProp.PI_JOB_HISTORY_PORT);
+            }
+
+            {
+                Composite subpanel = new Composite(panel, SWT.FILL);
+                subpanel.setLayout(new GridLayout(2, false));
+                data = new GridData();
+                data.horizontalSpan = 2;
+                data.horizontalAlignment = SWT.FILL;
+                subpanel.setLayoutData(data);
+
+                userName = createConfLabelText(this, subpanel, ConfProp.PI_USER_NAME, "&User name:");
+            }
+
+
+            /*
+             * DFS group
+             */
+            {
+                Group groupDFS = new Group(panel, SWT.SHADOW_NONE);
+                groupDFS.setText("DFS Master");
+                groupDFS.setToolTipText("Address of the Distributed FileSystem " + "master node (the Name Node).");
+                GridLayout layout = new GridLayout(2, false);
+                groupDFS.setLayout(layout);
+                data = new GridData();
+                data.horizontalAlignment = SWT.CENTER;
+                data.verticalAlignment = SWT.FILL;
+                data.widthHint = 250;
+                groupDFS.setLayoutData(data);
+
+                // Job Tracker host
+                Label label = new Label(groupDFS, SWT.NONE);
+                data = new GridData();
+                label.setText("Host:");
+                label.setLayoutData(data);
+
+                textNNHost = createConfText(this, groupDFS, ConfProp.PI_NAME_NODE_HOST);
+
+                // Job Tracker port
+                label = new Label(groupDFS, SWT.NONE);
+                data = new GridData();
+                label.setText("Port:");
+                label.setLayoutData(data);
+
+                textNNPort = createConfText(this, groupDFS, ConfProp.PI_NAME_NODE_PORT);
+            }
+
+            // SOCKS proxy group
+            {
+                Group groupSOCKS = new Group(panel, SWT.SHADOW_NONE);
+                groupSOCKS.setText("SOCKS proxy");
+                groupSOCKS.setToolTipText("Address of the SOCKS proxy to use " + "to connect to the infrastructure.");
+                GridLayout layout = new GridLayout(2, false);
+                groupSOCKS.setLayout(layout);
+                data = new GridData();
+                data.horizontalAlignment = SWT.CENTER;
+                data.widthHint = 250;
+                groupSOCKS.setLayoutData(data);
+
+                useSocksProxy = createConfCheckButton(this, groupSOCKS, ConfProp.PI_SOCKS_PROXY_ENABLE, "Enable SOCKS proxy");
+                data = new GridData();
+                data.horizontalSpan = 2;
+                useSocksProxy.setLayoutData(data);
+
+                // SOCKS proxy host
+                Label label = new Label(groupSOCKS, SWT.NONE);
+                data = new GridData();
+                label.setText("Host:");
+                label.setLayoutData(data);
+
+                socksProxyHost = createConfText(this, groupSOCKS, ConfProp.PI_SOCKS_PROXY_HOST);
+
+                // SOCKS proxy port
+                label = new Label(groupSOCKS, SWT.NONE);
+                data = new GridData();
+                label.setText("Port:");
+                label.setLayoutData(data);
+
+                socksProxyPort = createConfText(this, groupSOCKS, ConfProp.PI_SOCKS_PROXY_PORT);
+            }
+
+            // Update the state of all widgets according to the current
+            // values!
+            reloadConfProp(ConfProp.PI_COLOCATE_MASTERS);
+            reloadConfProp(ConfProp.PI_SOCKS_PROXY_ENABLE);
+            reloadConfProp(ConfProp.PI_HADOOP_VERSION);
+
+            return panel;
+        }
+
+        /**
+         * Reload the given configuration property value
+         * 
+         * @param prop
+         */
+        private void reloadConfProp(ConfProp prop) {
+            this.notifyChange(prop, location.getConfPropValue(prop));
+        }
+
+        public void notifyChange(ConfProp prop, String propValue) {
+            switch (prop) {
+            case PI_RESOURCE_MGR_HOST: {
+                textRMHost.setText(propValue);
+                break;
+            }
+            case PI_RESOURCE_MGR_PORT: {
+                textJTPort.setText(propValue);
+                break;
+            }
+            case PI_USER_NAME: {
+                userName.setText(propValue);
+                break;
+            }
+            case PI_COLOCATE_MASTERS: {
+                if (colocateMasters != null) {
+                    boolean colocate = propValue.equalsIgnoreCase("yes");
+                    colocateMasters.setSelection(colocate);
+                    if (textNNHost != null) {
+                        textNNHost.setEnabled(!colocate);
+                    }
+                    if (textJHHost != null) {
+                        textJHHost.setEnabled(!colocate);
+                    }
+                }
+                break;
+            }
+            case PI_NAME_NODE_HOST: {
+                textNNHost.setText(propValue);
+                break;
+            }
+            case PI_NAME_NODE_PORT: {
+                textNNPort.setText(propValue);
+                break;
+            }
+            case PI_JOB_HISTORY_HOST: {
+                textJHHost.setText(propValue);
+                break;
+            }
+            case PI_JOB_HISTORY_PORT: {
+                textJHPort.setText(propValue);
+                break;
+            }
+
+            case PI_SOCKS_PROXY_ENABLE: {
+                if (useSocksProxy != null) {
+                    boolean useProxy = propValue.equalsIgnoreCase("yes");
+                    useSocksProxy.setSelection(useProxy);
+                    if (socksProxyHost != null)
+                        socksProxyHost.setEnabled(useProxy);
+                    if (socksProxyPort != null)
+                        socksProxyPort.setEnabled(useProxy);
+                }
+                break;
+            }
+            case PI_SOCKS_PROXY_HOST: {
+                socksProxyHost.setText(propValue);
+                break;
+            }
+            case PI_SOCKS_PROXY_PORT: {
+                socksProxyPort.setText(propValue);
+                break;
+            }
+            }
+        }
+
+        /* @inheritDoc */
+        public void modifyText(ModifyEvent e) {
+            final Text text = (Text) e.widget;
+            final ConfProp prop = (ConfProp) text.getData("hProp");
+            Display.getDefault().syncExec(new Runnable() {
+                public void run() {
+                    mediator.notifyChange(TabMain.this, prop, text.getText());
+                }
+            });
+        }
+
+        /* @inheritDoc */
+        public void widgetDefaultSelected(SelectionEvent e) {
+            this.widgetSelected(e);
+        }
+
+        /* @inheritDoc */
+        public void widgetSelected(SelectionEvent e) {
+            final Button button = (Button) e.widget;
+            final ConfProp prop = (ConfProp) button.getData("hProp");
+
+            Display.getDefault().syncExec(new Runnable() {
+                public void run() {
+                    // We want to receive the update also!
+                    mediator.notifyChange(null, prop, button.getSelection() ? "yes" : "no");
+                }
+            });
+        }
+
+    }
+
+    private class TabAdvanced implements TabListener, ModifyListener {
+        TabMediator mediator;
+        private Composite panel;
+        private Map<String, Text> textMap = new TreeMap<String, Text>();
+
+        TabAdvanced(TabMediator mediator) {
+            this.mediator = mediator;
+            TabItem tab = new TabItem(mediator.folder, SWT.NONE);
+            tab.setText("Advanced parameters");
+            tab.setToolTipText("Access to advanced Hadoop parameters");
+            tab.setControl(createControl(mediator.folder));
+
+        }
+
+        private Control createControl(Composite parent) {
+            ScrolledComposite sc = new ScrolledComposite(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+            panel = buildPanel(sc);
+            sc.setContent(panel);
+            sc.setExpandHorizontal(true);
+            sc.setExpandVertical(true);
+            sc.setMinSize(640, 480);
+            sc.setMinSize(panel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+            return sc;
+        }
+
+        private Composite buildPanel(Composite parent) {
+            Composite panel = new Composite(parent, SWT.NONE);
+            GridLayout layout = new GridLayout();
+            layout.numColumns = 2;
+            layout.makeColumnsEqualWidth = false;
+            panel.setLayout(layout);
+            panel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
+
+            // Sort by property name
+            SortedMap<String, String> map = new TreeMap<String, String>();
+            Iterator<Entry<String, String>> it = location.getConfiguration();
+            while (it.hasNext()) {
+                Entry<String, String> entry = it.next();
+                map.put(entry.getKey(), entry.getValue());
+            }
+
+            for (Entry<String, String> entry : map.entrySet()) {
+                Text text = createConfNameEditor(this, panel, entry.getKey(), null);
+                textMap.put(entry.getKey(), text);
+            }
+            return panel;
+        }
+
+        public void notifyChange(ConfProp prop, final String propValue) {
+            Text text = textMap.get(location.getConfPropName(prop));
+            text.setText(propValue);
+        }
+
+        public void modifyText(ModifyEvent e) {
+            final Text text = (Text) e.widget;
+            Object hProp = text.getData("hProp");
+            final ConfProp prop = (hProp != null) ? (ConfProp) hProp : null;
+            Object hPropName = text.getData("hPropName");
+            final String propName = (hPropName != null) ? (String) hPropName : null;
+
+            Display.getDefault().syncExec(new Runnable() {
+                public void run() {
+                    if (prop != null)
+                        mediator.notifyChange(TabAdvanced.this, prop, text.getText());
+                    else
+                        mediator.notifyChange(TabAdvanced.this, propName, text.getText());
+                }
+            });
+        }
+
+    }
+
+    @Override
+    public void notifyChange(ConfProp confProp, String text) {
+        mediator.notifyChange(null, ConfProp.PI_LOCATION_NAME, text);
+    }
+
+    @Override
+    public void setChangeListener(ChangeListener l) {
+        changelistener=l;
+    }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/c308e976/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSServerWizardPage.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSServerWizardPage.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSServerWizardPage.java
index f0a68af..cf49d40 100644
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSServerWizardPage.java
+++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSServerWizardPage.java
@@ -24,11 +24,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.apache.hdt.core.HadoopVersion;
 import org.apache.hdt.core.hdfs.HDFSClient;
 import org.apache.hdt.core.internal.hdfs.HDFSManager;
 import org.apache.hdt.core.launch.ConfProp;
 import org.apache.hdt.ui.Activator;
-import org.apache.hdt.ui.internal.launch.HadoopLocationWizard;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.wizard.WizardPage;
@@ -130,8 +130,9 @@ public class NewHDFSServerWizardPage extends WizardPage {
 			label.setText("&HDFS Version:");
 			Combo options =  new Combo (c, SWT.SINGLE | SWT.BORDER|SWT.READ_ONLY);
 			options.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			options.add (HadoopLocationWizard.HADOOP_1);
-			options.add (HadoopLocationWizard.HADOOP_2);
+			for(HadoopVersion ver:HadoopVersion.values()){
+				options.add(ver.getDisplayName());
+			}
 			options.addListener (SWT.Selection, new Listener () {
 
 				@Override


Mime
View raw message