Author: rob.stryker(a)jboss.com Date: 2011-06-22 05:54:31 -0400 (Wed, 22 Jun 2011) New Revision: 32277 Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: /JBIDE-9210 to branch (last minute addition, woohoo) Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -130,6 +130,7 @@ */ public JBoss7ServerState getServerState(String host, int port) throws Exception; + @Deprecated public JBoss7ServerState getServerState(String host) throws Exception; /** @@ -140,6 +141,7 @@ */ public void stop(String host, int port) throws Exception; + @Deprecated public void stop(String host) throws Exception; public void dispose(); Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -15,6 +15,7 @@ import java.util.List; import java.util.Properties; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; @@ -48,6 +49,13 @@ return server; } + private int getManagementPort() { + JBoss7Server server = (JBoss7Server)getServer().loadAdapter(JBoss7Server.class, new NullProgressMonitor()); + if( server != null ) + return server.getManagementPort(); + return 9999; + } + public boolean isComplete() throws PollingException, RequiresInfoException { IJBoss7ManagerService service = null; try { @@ -68,7 +76,7 @@ try { JBoss7ServerState serverState = null; do { - serverState = service.getServerState(getServer().getHost()); + serverState = service.getServerState(getServer().getHost(), getManagementPort()); } while (serverState == JBoss7ServerState.STARTING); return serverState == JBoss7ServerState.RUNNING; } catch (Exception e) { @@ -80,7 +88,7 @@ try { JBoss7ServerState serverState = null; do { - serverState = service.getServerState(getServer().getHost()); + serverState = service.getServerState(getServer().getHost(), getManagementPort()); } while (serverState == JBoss7ServerState.RUNNING); return false; } catch (JBoss7ManangerConnectException e) { @@ -100,7 +108,7 @@ IJBoss7ManagerService service = null; try { service = JBoss7ManagerUtil.getService(getServer()); - JBoss7ServerState serverState = service.getServerState(getServer().getHost()); + JBoss7ServerState serverState = service.getServerState(getServer().getHost(), getManagementPort()); return serverState == JBoss7ServerState.RUNNING || serverState == JBoss7ServerState.RESTART_REQUIRED; } catch (Exception e) { Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -47,6 +47,7 @@ return checkedGetService().getServerState(host, port); } + @Deprecated public JBoss7ServerState getServerState(String host) throws Exception { return checkedGetService().getServerState(host); } @@ -55,6 +56,7 @@ checkedGetService().stop(host, port); } + @Deprecated public void stop(String host) throws Exception { checkedGetService().stop(host); } Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -33,6 +33,11 @@ return false; } + public int getManagementPort() { + return findPort(AS7_MANAGEMENT_PORT, AS7_MANAGEMENT_PORT_DETECT, AS7_MANAGEMENT_PORT_DETECT_XPATH, + AS7_MANAGEMENT_PORT_DEFAULT_XPATH, AS7_MANAGEMENT_PORT_DEFAULT_PORT); + } + @Override public String getDeployLocationType() { return getAttribute(DEPLOY_DIRECTORY_TYPE, DEPLOY_SERVER); Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.debug.core.DebugEvent; @@ -68,6 +69,10 @@ return delegateClassMap; } + private JBoss7Server getJBoss7Server() { + return (JBoss7Server)getServer().loadAdapter(JBoss7Server.class, new NullProgressMonitor()); + } + public boolean shouldSuspendScanner() { return false; } @@ -143,9 +148,9 @@ return service; } - private boolean isServerRunning(String host) throws Exception { + private boolean isServerRunning(String host, int port) throws Exception { try { - return getService().getServerState(host) == JBoss7ServerState.RUNNING; + return getService().getServerState(host, port) == JBoss7ServerState.RUNNING; } catch (JBoss7ManangerConnectException e) { return false; } @@ -165,9 +170,9 @@ } else { serverStopping(); // TODO: for now only local, implement for remote afterwards - if (isServerRunning(getServer().getHost())) { + if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) { // The service and Poller will make sure the server is down - getService().stop(getServer().getHost()); + getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort()); return; } else { if( serverProcess != null && !serverProcess.isTerminated()) { Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -87,15 +87,23 @@ public static final String SERVER_USERNAME = "org.jboss.ide.eclipse.as.core.server.userName"; //$NON-NLS-1$ public static final String SERVER_PASSWORD = "org.jboss.ide.eclipse.as.core.server.password"; //$NON-NLS-1$ public static final String JNDI_PORT = "org.jboss.ide.eclipse.as.core.server.jndiPort"; //$NON-NLS-1$ + public static final String JNDI_PORT_DETECT = "org.jboss.ide.eclipse.as.core.server.jndiPortAutoDetect"; //$NON-NLS-1$ + public static final String JNDI_PORT_DETECT_XPATH = "org.jboss.ide.eclipse.as.core.server.jndiPortAutoDetect.XPath"; //$NON-NLS-1$ + public static final String JNDI_PORT_DEFAULT_XPATH = Messages.Ports + IPath.SEPARATOR + "JNDI"; //$NON-NLS-1$ + public static final int JNDI_DEFAULT_PORT = 1099; + public static final String WEB_PORT = "org.jboss.ide.eclipse.as.core.server.webPort"; //$NON-NLS-1$ - public static final String JNDI_PORT_DETECT = "org.jboss.ide.eclipse.as.core.server.jndiPortAutoDetect"; //$NON-NLS-1$ public static final String WEB_PORT_DETECT= "org.jboss.ide.eclipse.as.core.server.webPortAutoDetect"; //$NON-NLS-1$ - public static final String JNDI_PORT_DETECT_XPATH = "org.jboss.ide.eclipse.as.core.server.jndiPortAutoDetect.XPath"; //$NON-NLS-1$ public static final String WEB_PORT_DETECT_XPATH = "org.jboss.ide.eclipse.as.core.server.webPortAutoDetect.XPath"; //$NON-NLS-1$ - public static final String JNDI_PORT_DEFAULT_XPATH = Messages.Ports + IPath.SEPARATOR + "JNDI"; //$NON-NLS-1$ public static final String WEB_PORT_DEFAULT_XPATH = Messages.Ports + IPath.SEPARATOR + "JBoss Web"; //$NON-NLS-1$ - public static final int JNDI_DEFAULT_PORT = 1099; - public static final int JBOSS_WEB_DEFAULT_PORT = 8080; + public static final int JBOSS_WEB_DEFAULT_PORT = 8080; + + public static final String AS7_MANAGEMENT_PORT = "org.jboss.ide.eclipse.as.core.server.as7.managementPort"; //$NON-NLS-1$ + public static final String AS7_MANAGEMENT_PORT_DETECT= "org.jboss.ide.eclipse.as.core.server.as7.managementPortAutoDetect"; //$NON-NLS-1$ + public static final String AS7_MANAGEMENT_PORT_DETECT_XPATH = "org.jboss.ide.eclipse.as.core.server.as7.managementPortAutoDetect.XPath"; //$NON-NLS-1$ + public static final String AS7_MANAGEMENT_PORT_DEFAULT_XPATH = Messages.Ports + IPath.SEPARATOR + "JBoss Management"; //$NON-NLS-1$ + public static final int AS7_MANAGEMENT_PORT_DEFAULT_PORT = 9999; + public static final String IGNORE_LAUNCH_COMMANDS = "org.jboss.ide.eclipse.as.core.server.IGNORE_LAUNCH_COMMANDS"; //$NON-NLS-1$ public static final String LOCAL_DEPLOYMENT_NAME = "name"; //$NON-NLS-1$ Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2011-06-22 09:54:31 UTC (rev 32277) @@ -1,3 +1,6 @@ JBoss_Web=//*[@name="standard-sockets"]/*[@name="http"] JBoss_Web_FILE=standalone/configuration/standalone.xml -JBoss_Web_ATTRIBUTE=port \ No newline at end of file +JBoss_Web_ATTRIBUTE=port +JBoss_Management=//*[local-name()="management-interfaces"]/*[local-name()="native-interface"] +JBoss_Management_ATTRIBUTE=port +JBoss_Management_FILE=standalone/configuration/standalone.xml \ No newline at end of file Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -52,17 +52,19 @@ return manager.getDeploymentState(deploymentName); } + @Deprecated + public JBoss7ServerState getServerState(String host) throws Exception { + return getServerState(host, AS7Manager.MGMT_PORT); + } + public JBoss7ServerState getServerState(String host, int port) throws Exception { AS7Manager manager = new AS7Manager(host, port); return manager.getServerState(); } - public JBoss7ServerState getServerState(String host) throws Exception { - return new AS7Manager(host).getServerState(); - } - + @Deprecated public void stop(String host) throws Exception { - new AS7Manager(host).stopServer(); + stop(host, AS7Manager.MGMT_PORT); } public void stop(String host, int port) throws Exception { Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -198,11 +198,13 @@ public static String EditorJNDIPort; public static String EditorWebPort; public static String EditorJMXRMIPort; + public static String EditorAS7ManagementPort; public static String EditorAutomaticallyDetectPort; public static String EditorPortInvalid; public static String EditorChangeJNDICommandName; public static String EditorChangeWebCommandName; public static String EditorChangeJMXRMICommandName; + public static String EditorChangeAS7ManagementCommandName; public static String EditorChangeUsernameCommandName; public static String EditorChangePasswordCommandName; public static String EditorCPD_Value; Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-22 09:54:31 UTC (rev 32277) @@ -168,14 +168,16 @@ EditorChangeStopPollerCommandName=Change Shutdown Poller EditorServerPorts=Server Ports EditorServerPortsDescription=The ports entered here are which ports the tools\nwill poll the server on. Changing these fields\nwill not change the ports the server itself listens on. -EditorJNDIPort=JNDI Port -EditorWebPort=Web Port -EditorJMXRMIPort=JMX RMI Port +EditorJNDIPort=JNDI +EditorWebPort=Web +EditorJMXRMIPort=JMX RMI +EditorAS7ManagementPort=Management EditorAutomaticallyDetectPort=Automatically detect EditorPortInvalid=One or more ports have an invalid value. This may adversely affect the tooling's ability to interact with the server. EditorChangeJNDICommandName=Change JNDI Port Details EditorChangeWebCommandName=Change Web Port Details EditorChangeJMXRMICommandName=Change JMX RMI Port Details +EditorChangeAS7ManagementCommandName=Change AS7 Management Port Details EditorChangeUsernameCommandName=Change Username EditorChangePasswordCommandName=Change Password EditorCPD_Value=Current Value Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-06-22 09:54:31 UTC (rev 32277) @@ -50,6 +50,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.Messages; import org.jboss.ide.eclipse.as.ui.dialogs.ChangePortDialog; @@ -141,7 +142,18 @@ } } + public static class JBoss7ManagementPortEditorExtension extends PortEditorExtension { + public JBoss7ManagementPortEditorExtension() { + super(Messages.EditorAS7ManagementPort, + IJBossToolingConstants.AS7_MANAGEMENT_PORT_DETECT_XPATH, + IJBossToolingConstants.AS7_MANAGEMENT_PORT_DETECT, + IJBossToolingConstants.AS7_MANAGEMENT_PORT, + IJBossToolingConstants.AS7_MANAGEMENT_PORT_DEFAULT_XPATH, + Messages.EditorChangeAS7ManagementCommandName); + } + } + public static abstract class PortEditorExtension implements IPortEditorExtension { protected Button detect; protected Text text; Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-22 09:06:44 UTC (rev 32276) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-22 09:54:31 UTC (rev 32277) @@ -281,6 +281,10 @@ class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss6JMXRMIPortEditorExtension" serverIds="org.jboss.ide.eclipse.as.60"> </section> + <section + class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7ManagementPortEditorExtension" + serverIds="org.jboss.ide.eclipse.as.70"> + </section> </extension>