Author: rob.stryker(a)jboss.com Date: 2010-02-04 10:17:43 -0500 (Thu, 04 Feb 2010) New Revision: 20127 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/wizard/SCPServerWizardFragment.java Log: JBIDE-5760 - defaulting ssh server's known_hosts Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java 2010-02-04 14:05:16 UTC (rev 20126) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java 2010-02-04 15:17:43 UTC (rev 20127) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.ssh.server; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Preferences; +import org.eclipse.jsch.internal.core.JSchCorePlugin; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.internal.Server; @@ -30,6 +33,10 @@ } public static String getHostsFile(IServer server) { - return ((Server)server).getAttribute(ISSHDeploymentConstants.HOSTS_FILE, (String)null); + Preferences jschPrefs = JSchCorePlugin.getPlugin().getPluginPreferences(); + String sshHome = jschPrefs.getDefaultString(org.eclipse.jsch.internal.core.IConstants.KEY_SSH2HOME); + sshHome += Path.SEPARATOR + "known_hosts"; + return ((Server)server).getAttribute(ISSHDeploymentConstants.HOSTS_FILE, + sshHome); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/wizard/SCPServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/wizard/SCPServerWizardFragment.java 2010-02-04 14:05:16 UTC (rev 20126) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/wizard/SCPServerWizardFragment.java 2010-02-04 15:17:43 UTC (rev 20127) @@ -36,11 +36,10 @@ public class SCPServerWizardFragment extends WizardFragment { private IWizardHandle handle; - private Text userText, passText, deployText, hostsFileText; + private Text userText, passText, deployText; private ModifyListener listener; private SelectionListener browseHostsButtonListener; - private Button browseHostsFileButton; - private String user, pass, deploy, hostFile; + private String user, pass, deploy; public SCPServerWizardFragment() { super(); @@ -102,49 +101,13 @@ passText.addModifyListener(listener); passText.setEnabled(true); passText.setLayoutData(textData); - - Label hostsLabel = new Label(inner, SWT.NONE); - hostsLabel.setText(Messages.HostsLabel); - Composite hostsFileComposite = new Composite(inner, SWT.NONE); - hostsFileComposite.setLayoutData(textData); - hostsFileComposite.setLayout(new GridLayout(2,false)); - - hostsFileText = new Text(hostsFileComposite, SWT.BORDER); - hostsFileText.setText("/home/username/.ssh/known_hosts"); - hostsFileText.addModifyListener(listener); - hostsFileText.setEnabled(true); - GridData hostsFileData = new GridData(SWT.LEFT, SWT.CENTER, true, false); - hostsFileData.widthHint = 200; - hostsFileData.grabExcessHorizontalSpace = true; - hostsFileText.setLayoutData(hostsFileData); - - browseHostsFileButton = new Button(hostsFileComposite, SWT.PUSH); - browseHostsFileButton.setText(Messages.browse); - browseHostsButtonListener = new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - browseForHostsSelected(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }; - browseHostsFileButton.addSelectionListener(browseHostsButtonListener); } - protected void browseForHostsSelected() { - FileDialog d = new FileDialog(new Shell()); - IPath p = ServerUtil.makeGlobal(null, new Path(hostsFileText.getText())); - d.setFilterPath(p.toString()); - String x = d.open(); - if (x != null) { - hostsFileText.setText(x); - } - } protected void updateValues() { user = userText.getText(); pass = passText.getText(); deploy = deployText.getText(); - hostFile = hostsFileText.getText(); validate(); } @@ -157,10 +120,7 @@ } protected void validate() { - if( hostFile == null || !(new File(hostFile).exists()) || !(new File(hostFile).isFile())) - handle.setMessage("Host file must exist", IMessageProvider.ERROR); - else - handle.setMessage(null, IMessageProvider.NONE); + handle.setMessage(null, IMessageProvider.NONE); handle.update(); } @@ -173,7 +133,7 @@ SSHServerDelegate server = (SSHServerDelegate)serverWC.loadAdapter(SSHServerDelegate.class, new NullProgressMonitor()); server.setUsername(user); //$NON-NLS-1$ server.setPassword(pass); //$NON-NLS-1$ - server.setHostsFile(hostFile); + server.setHostsFile(null); server.setDeployFolder(deploy); } }