HADOOP-1437. Updates to Eclipse plugin, also move it to 0.14.0 release. Contributed by Christophe Taton.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@566879 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -28,9 +28,6 @@ Trunk (unreleased changes)
     HADOOP-1610.  Add metrics for failed tasks.
     (Devaraj Das via tomwhite)
 
-    HADOOP-1437.  Add Eclipse plugin in contrib.
-    (Eugene Hung and Christophe Taton via cutting)
-
   OPTIMIZATIONS
 
     HADOOP-1565.  Reduce memory usage of NameNode by replacing 
@@ -593,6 +590,9 @@ Release 0.14.0 - 2007-08-17
 158. HADOOP-1717.  Fix TestDFSUpgradeFromImage to work on Solaris.
      (nigel via cutting)
 
+159. HADOOP-1437.  Add Eclipse plugin in contrib.
+     (Eugene Hung and Christophe Taton via cutting)
+
 
 Release 0.13.0 - 2007-06-08
 

src/contrib/eclipse-plugin/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

src/contrib/eclipse-plugin/META-INF/MANIFEST.MF

@@ -24,5 +24,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.team.cvs.ssh2,
  com.jcraft.jsch
 Eclipse-LazyStart: true
-Bundle-ClassPath: bin/
+Bundle-ClassPath: classes/
 Bundle-Vendor: Apache Hadoop

src/contrib/eclipse-plugin/build.xml

@@ -36,9 +36,10 @@
   <target name="jar" depends="compile" unless="skip.contrib">
     <jar
       jarfile="${build.dir}/hadoop-${name}.jar"
-      basedir="${build.classes}"
-      manifest="META-INF/MANIFEST.MF"
-    />
+      manifest="${root}/META-INF/MANIFEST.MF">
+      <fileset dir="${build.dir}" includes="classes/"/>
+      <fileset dir="${root}" includes="resources/ plugin.xml"/>
+    </jar>
   </target>
 
 </project>

src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/SWTUserInfo.java

@@ -34,17 +34,26 @@ import com.jcraft.jsch.UIKeyboardInteractive;
 import com.jcraft.jsch.UserInfo;
 
 /**
- * Data structure for retaining user login information
+ * SWT Forms to prompt for passwords or for keyboard interactive
+ * authentication
  */
 public abstract class SWTUserInfo implements UserInfo, UIKeyboardInteractive {
 
+  /**
+   * Password that was last tried; this to prevent sending many times the
+   * "saved" password if it does not work
+   */
+  private String triedPassword = null;
+
   public SWTUserInfo() {
   }
 
+  /* @inheritDoc */
   public String getPassphrase() {
     return this.getPassword();
   }
 
+  /* @inheritDoc */
   public abstract String getPassword();
 
   public abstract void setPassword(String pass);
@@ -53,6 +62,7 @@ public abstract class SWTUserInfo implements UserInfo, UIKeyboardInteractive {
     this.setPassword(pass);
   }
 
+  /* @inheritDoc */
   public boolean promptPassphrase(final String arg0) {
     Display.getDefault().syncExec(new Runnable() {
       public void run() {
@@ -64,37 +74,46 @@ public abstract class SWTUserInfo implements UserInfo, UIKeyboardInteractive {
   }
 
   public boolean promptPassword(final String arg0) {
-    // check if password is already set to prevent the second session from
-    // querying again -- eyhung
-    // how to prevent bad passwords?
-    if (this.getPassword() == null) {
+    /*
+     * Ask the user for the password if we don't know it, or if we now it but
+     * already tried it
+     */
+    if ((this.getPassword() == null)
+        || this.getPassword().equals(this.triedPassword)) {
       Display.getDefault().syncExec(new Runnable() {
         public void run() {
           Shell parent = Display.getDefault().getActiveShell();
           String password = new PasswordDialog(parent).prompt(arg0);
+          SWTUserInfo.this.triedPassword = password;
           SWTUserInfo.this.setPassword(password);
         }
       });
     }
+
     return this.getPassword() != null;
   }
 
-  private boolean result;
+  /**
+   * To store the result of the Yes/No message dialog
+   */
+  private boolean yesNoResult;
 
+  /* @inheritDoc */
   public boolean promptYesNo(final String arg0) {
 
     Display.getDefault().syncExec(new Runnable() {
       public void run() {
-        result =
+        yesNoResult =
             MessageDialog.openQuestion(
                 Display.getDefault().getActiveShell(),
                 "SSH Question Dialog", arg0);
       }
     });
 
-    return result;
+    return yesNoResult;
   }
 
+  /* @inheritDoc */
   public void showMessage(final String arg0) {
     Display.getDefault().syncExec(new Runnable() {
       public void run() {
@@ -103,6 +122,9 @@ public abstract class SWTUserInfo implements UserInfo, UIKeyboardInteractive {
     });
   }
 
+  /**
+   * To store the answers from the keyboard interactive dialog
+   */
   private String[] interactiveAnswers;
 
   /* @inheritDoc */
@@ -124,12 +146,11 @@ public abstract class SWTUserInfo implements UserInfo, UIKeyboardInteractive {
    * Simple password prompting dialog
    */
   public static class PasswordDialog extends Dialog {
+
     private Text text;
 
     private String password;
 
-    private Label title;
-
     private String message;
 
     protected PasswordDialog(Shell parentShell) {
@@ -159,7 +180,7 @@ public abstract class SWTUserInfo implements UserInfo, UIKeyboardInteractive {
       panel.setLayout(new GridLayout(2, false));
       panel.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-      title = new Label(panel, SWT.NONE);
+      Label title = new Label(panel, SWT.NONE);
       GridData span2 = new GridData(GridData.FILL_HORIZONTAL);
       span2.horizontalSpan = 2;
       title.setLayoutData(span2);

src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java

@@ -101,8 +101,6 @@ public class HadoopServer {
    */
   private String name;
 
-  // the machine that we are tunneling through to get to the Hadoop server
-
   /**
    * Host name of the tunneling machine
    */
@@ -169,7 +167,7 @@ public class HadoopServer {
       session.setUserInfo(new SWTUserInfo() {
         @Override
         public String getPassword() {
-          return password;
+          return HadoopServer.this.password;
         }
 
         @Override
@@ -182,6 +180,7 @@ public class HadoopServer {
         try {
           session.connect();
         } catch (JSchException jse) {
+          // Reset password in case the authentication failed
           if (jse.getMessage().equals("Auth fail"))
             this.password = null;
           throw jse;
@@ -210,6 +209,7 @@ public class HadoopServer {
         try {
           session.connect();
         } catch (JSchException jse) {
+          // Reset password in case the authentication failed
           if (jse.getMessage().equals("Auth fail"))
             this.password = null;
           throw jse;
@@ -246,20 +246,23 @@ public class HadoopServer {
             tunnelHostName, 22);
     tunnel.setTimeout(0);
     tunnel.setPortForwardingL(tunnelPort, hostName, port);
+
     tunnel.setUserInfo(new SWTUserInfo() {
       @Override
       public String getPassword() {
-        return tunnelPassword;
+        return HadoopServer.this.tunnelPassword;
       }
 
       @Override
       public void setPassword(String password) {
-        tunnelPassword = password;
+        HadoopServer.this.tunnelPassword = password;
       }
     });
+
     try {
       tunnel.connect();
     } catch (JSchException jse) {
+      // Reset password in case the authentication failed
       if (jse.getMessage().equals("Auth fail"))
         this.tunnelPassword = null;
       throw jse;
@@ -282,12 +285,22 @@ public class HadoopServer {
     }
   }
 
-  public String getHostName() {
+  /**
+   * Return the effective host name to use to contact the server. The
+   * effective host name might be "localhost" if we setup a tunnel.
+   * 
+   * @return the effective host name to use contact the server
+   */
+  public String getEffectiveHostName() {
     if ((tunnelHostName != null) && (tunnelHostName.length() > 0)) {
       return "localhost";
     }
 
-    return hostName;
+    return this.hostName;
+  }
+  
+  public String getHostName() {
+    return this.hostName;
   }
 
   public void setHostname(String hostname) {
@@ -346,8 +359,8 @@ public class HadoopServer {
    */
   public URL getJobTrackerUrl() throws MalformedURLException {
     if (tunnelHostName == null) {
-      return new URL("http://" + getHostName() + ":" + JOB_TRACKER_PORT
-          + "/jobtracker.jsp");
+      return new URL("http://" + getEffectiveHostName() + ":"
+          + JOB_TRACKER_PORT + "/jobtracker.jsp");
     } else {
       try {
         createHttpTunnel(JOB_TRACKER_PORT);
@@ -461,7 +474,7 @@ public class HadoopServer {
       // jar.buildJar(monitor).toString());
 
       copy.setAttribute("hadoop.jarrable", jar.toMemento());
-      copy.setAttribute("hadoop.host", this.getHostName());
+      copy.setAttribute("hadoop.host", this.getEffectiveHostName());
       copy.setAttribute("hadoop.user", this.getUserName());
       copy.setAttribute("hadoop.serverid", this.id);
       copy.setAttribute("hadoop.path", this.getInstallPath());