Author: rob.stryker(a)jboss.com Date: 2009-01-16 04:23:13 -0500 (Fri, 16 Jan 2009) New Revision: 13078 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java Log: JBIDE-3046 - changed JMX credential dialog and added an ignore button so user can accept the server is started Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2009-01-16 06:23:00 UTC (rev 13077) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2009-01-16 09:23:13 UTC (rev 13078) @@ -53,6 +53,7 @@ public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"; public static final int JMXPOLLER_CODE = IEventCodes.JMXPOLLER_CODE; + public static final Properties IGNORED_PROPERTIES = new Properties(); public static final String REQUIRED_USER = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_USER"; public static final String REQUIRED_PASS = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_PASS"; @@ -127,14 +128,20 @@ } else { // we're waiting. are they back yet? if( requiredPropertiesReturned != null ) { - requiresInfoException = null; - String user, pass; - user = (String)requiredPropertiesReturned.get(REQUIRED_USER); - pass = (String)requiredPropertiesReturned.get(REQUIRED_PASS); - requiredPropertiesReturned = null; - runner.setUser(user); - runner.setPass(pass); - waitingForCredentials = false; + if( requiredPropertiesReturned == IGNORED_PROPERTIES) { + requiresInfoException = null; + done = true; + started = STATE_STARTED; + } else { + requiresInfoException = null; + String user, pass; + user = (String)requiredPropertiesReturned.get(REQUIRED_USER); + pass = (String)requiredPropertiesReturned.get(REQUIRED_PASS); + requiredPropertiesReturned = null; + runner.setUser(user); + runner.setPass(pass); + waitingForCredentials = false; + } } } } @@ -216,8 +223,7 @@ public void failureHandled(Properties properties) { if( properties == null ) { - done = true; - pollingException = new PollingException("Request for more information ignored"); + requiredPropertiesReturned = IGNORED_PROPERTIES; } else requiredPropertiesReturned = properties; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-16 06:23:00 UTC (rev 13077) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-16 09:23:13 UTC (rev 13078) @@ -32,7 +32,7 @@ sswf_Title=Create a new System Copy Server sswf_BaseName=Local Deployer -credentials_warning=Your server is throwing a security exception.\nPlease enter your username and password now, or\nenter them in the server editor by double-clicking on the server. +credentials_warning=Your server is responding to JMX inquiries with a Security Exception.\nYou can try entering new credentials below, or you can double-click\non your server and verify that the host, JNDI port, username, and password are accurate.\nYou can also click "ignore" below to begin working with your server,\nbut deploying to and stopping the server may not function properly. credentials_save=Save these credentials? #Server View (server and categories, properties) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2009-01-16 06:23:00 UTC (rev 13077) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2009-01-16 09:23:13 UTC (rev 13078) @@ -22,6 +22,7 @@ package org.jboss.ide.eclipse.as.ui.dialogs; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -45,7 +46,7 @@ * */ public class RequiredCredentialsDialog extends Dialog { - + public static final int IGNORE_ID = IDialogConstants.CLIENT_ID | 3; private String user, pass; private boolean save; private JBossServer jbs; @@ -118,7 +119,15 @@ saveCredentials.setSelection(true); return c; } + + protected void createButtonsForButtonBar(Composite parent) { + // create OK and Cancel buttons by default + createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, + true); + createButton(parent, IDialogConstants.CANCEL_ID, "Ignore", false); + } + private FormData createFormData(Object topStart, int topOffset, Object bottomStart, int bottomOffset, Object leftStart, int leftOffset, Object rightStart, int rightOffset) { FormData data = new FormData();