Author: rob.stryker(a)jboss.com Date: 2011-12-01 09:44:07 -0500 (Thu, 01 Dec 2011) New Revision: 36833 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.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/plugin.xml Log: JBIDE-10298 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-12-01 13:50:44 UTC (rev 36832) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-12-01 14:44:07 UTC (rev 36833) @@ -33,6 +33,8 @@ setAttribute(DEPLOY_DIRECTORY_TYPE, DEPLOY_SERVER); setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, true); setAttribute(IJBossToolingConstants.WEB_PORT, IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT); + setUsername(null); + setPassword(null); // In an emergency, we can switch pollers for EAP if( isEAP(getServer())) setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, WebPortPoller.WEB_POLLER_ID); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2011-12-01 13:50:44 UTC (rev 36832) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2011-12-01 14:44:07 UTC (rev 36833) @@ -17,8 +17,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IServerProvider; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server; import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class AS7ManagementDetails implements IServerProvider { private IServer server; @@ -48,6 +50,14 @@ public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException { ArrayList<String> requiredProperties = new ArrayList<String>(); requiredProperties.addAll(Arrays.asList(prompts)); + JBossServer jbs = ServerConverter.getJBossServer(server); + boolean emptyCreds = + (jbs.getUsername() == null || jbs.getUsername().equals("")) //$NON-NLS-1$ + && (jbs.getPassword() == null || jbs.getPassword().equals("")); //$NON-NLS-1$ + if( !emptyCreds ) { + return new String[]{jbs.getUsername(), jbs.getPassword()}; + } + Properties props = PollThreadUtils.requestCredentialsSynchronous(this, requiredProperties); if( props == null ) 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 2011-12-01 13:50:44 UTC (rev 36832) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-01 14:44:07 UTC (rev 36833) @@ -41,8 +41,8 @@ swf_Explanation=A JBoss Server manages starting and stopping instances of JBoss. \nIt manages command line arguments and keeps track of which modules have been deployed. swf_Explanation2=If the runtime information below is incorrect, please press back, Installed Runtimes..., \nand then Add to create a new runtime from a different location. swf_ConfigurationLocation=Configuration Location -swf_AuthorizationDescription=Set the JMX login and password for your server.\nThis is used by all JMX commands, and during server shutdown. -swf_AuthenticationGroup=JMX Login Credentials +swf_AuthorizationDescription=Set the management login and password for your server.\nThis is used by all management commands, and during server shutdown. +swf_AuthenticationGroup=Management Login Credentials swf_Username=User Name swf_Password=Password swf_BaseName=JBoss _VERSION_ Server Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-12-01 13:50:44 UTC (rev 36832) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-12-01 14:44:07 UTC (rev 36833) @@ -180,7 +180,7 @@ id="org.jboss.ide.eclipse.as.ui.editor.passwordSection" insertionId="org.eclipse.wst.server.editor.overview.left" order="10" - typeIds="%ServerTypesJBoss6OrLower"/> + typeIds="%AllJBossServerTypes"/> <section class="org.jboss.ide.eclipse.as.ui.editor.ServerModeSection" id="org.jboss.ide.eclipse.as.ui.editor.serverModeSection"