[jbosstools-commits] JBoss Tools SVN: r39175 - in branches/jbosstools-3.3.0.Beta1/as/plugins: org.jboss.ide.eclipse.as.ui and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-02-28 11:14:14 -0500 (Tue, 28 Feb 2012) New Revision: 39175 Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-11055 to branch beta1 Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-28 16:12:11 UTC (rev 39174) +++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-28 16:14:14 UTC (rev 39175) @@ -28,20 +28,14 @@ import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT; import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT_XPATH; -import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLEncoder; import java.util.Date; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.security.storage.EncodingUtils; -import org.eclipse.equinox.security.storage.ISecurePreferences; -import org.eclipse.equinox.security.storage.SecurePreferencesFactory; -import org.eclipse.equinox.security.storage.StorageException; import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -250,7 +244,7 @@ // first class parameters public String getUsername() { - return getAttribute(SERVER_USERNAME, ""); //$NON-NLS-1$ + return getAttribute(SERVER_USERNAME, "admin"); //$NON-NLS-1$ } public void setUsername(String name) { setAttribute(SERVER_USERNAME, name); Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-02-28 16:12:11 UTC (rev 39174) +++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-02-28 16:14:14 UTC (rev 39175) @@ -11,6 +11,7 @@ package org.jboss.ide.eclipse.as.ui.editor; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; @@ -68,12 +69,12 @@ Label username = toolkit.createLabel(composite, Messages.swf_Username); username.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - String n = helper.getAttribute(IJBossToolingConstants.SERVER_USERNAME, ""); //$NON-NLS-1$ + String n = ServerConverter.getJBossServer(server.getOriginal()).getUsername(); String p = ServerConverter.getJBossServer(server.getOriginal()).getPassword(); nameText = toolkit.createText(composite, n); Label password = toolkit.createLabel(composite, Messages.swf_Password); password.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - passText = toolkit.createText(composite, p); + passText = toolkit.createText(composite, p, SWT.SINGLE | SWT.PASSWORD); passwordString = p; d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100; Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-02-28 16:12:11 UTC (rev 39174) +++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-02-28 16:14:14 UTC (rev 39175) @@ -186,13 +186,13 @@ class="org.jboss.ide.eclipse.as.ui.editor.ServerPasswordSection" id="org.jboss.ide.eclipse.as.ui.editor.passwordSection" insertionId="org.eclipse.wst.server.editor.overview.left" - order="10" + order="9" typeIds="%AllJBossServerTypes"/> <section class="org.jboss.ide.eclipse.as.ui.editor.ServerModeSection" id="org.jboss.ide.eclipse.as.ui.editor.serverModeSection" insertionId="org.eclipse.wst.server.editor.overview.left" - order="9" + order="10" typeIds="%AllJBTServerTypes"/> <!-- NEW_SERVER_ADAPTER Add the server editor sections for a new server above this line -->