Author: rob.stryker(a)jboss.com Date: 2011-06-08 06:42:20 -0400 (Wed, 08 Jun 2011) New Revision: 31905 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 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/util/IJBossToolingConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-8610 and JBIDE-8611 fixing automatic detection for web port. Not optimal, but good for now. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -87,7 +87,9 @@ } private IStatus handleAddJBoss7XPaths(IServer server2) { - // TODO + ArrayList<XPathCategory> defaults = loadDefaults(server2, server2.getRuntime().getLocation().toOSString()); + serverToCategories.put(server2.getId(), defaults); + save(server2); return Status.OK_STATUS; } @@ -100,7 +102,7 @@ ArrayList<XPathCategory> defaults = loadDefaults(server2, configFolder.toOSString()); serverToCategories.put(server2.getId(), defaults); save(server2); - } + } } return Status.OK_STATUS; } @@ -264,6 +266,7 @@ rtToPortsFile.put(IConstants.AS_50, properties.append(IJBossToolingConstants.DEFAULT_PROPS_50)); rtToPortsFile.put(IConstants.AS_51, properties.append(IJBossToolingConstants.DEFAULT_PROPS_51)); rtToPortsFile.put(IConstants.AS_60, properties.append(IJBossToolingConstants.DEFAULT_PROPS_60)); + rtToPortsFile.put(IConstants.AS_70, properties.append(IJBossToolingConstants.DEFAULT_PROPS_70)); rtToPortsFile.put(IConstants.EAP_43, properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_43)); rtToPortsFile.put(IConstants.EAP_50, properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_50)); } 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-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -25,7 +25,7 @@ public void setDefaults(IProgressMonitor monitor) { super.setDefaults(monitor); setAttribute(DEPLOY_DIRECTORY_TYPE, DEPLOY_SERVER); - setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, false); + setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, true); setAttribute(IJBossToolingConstants.WEB_PORT, IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT); setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -71,6 +71,7 @@ public static final String DEFAULT_PROPS_50 = "jboss.50.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_51 = "jboss.51.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_60 = "jboss.60.default.ports.properties"; //$NON-NLS-1$ + public static final String DEFAULT_PROPS_70 = "jboss.70.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_EAP_43 = "jboss.eap.43.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_EAP_50 = "jboss.eap.50.default.ports.properties"; //$NON-NLS-1$ Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2011-06-08 10:42:20 UTC (rev 31905) @@ -0,0 +1,3 @@ +JBoss_Web=//*[@name="standard-sockets"]/*[@name="http"] +JBoss_Web_FILE=standalone/configuration/standalone.xml +JBoss_Web_ATTRIBUTE=port \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -129,17 +129,6 @@ Messages.EditorChangeWebCommandName); } } - - public static class JBoss7WebPortEditorExtension extends PortEditorExtension { - public JBoss7WebPortEditorExtension() { - super(Messages.EditorWebPort, - null, - IJBossServerConstants.WEB_PORT_DETECT, - IJBossServerConstants.WEB_PORT, - null, - Messages.EditorChangeWebCommandName); - } - } public static class JBoss6JMXRMIPortEditorExtension extends PortEditorExtension { public JBoss6JMXRMIPortEditorExtension() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-08 10:42:20 UTC (rev 31905) @@ -275,13 +275,9 @@ </section> <section class="org.jboss.ide.eclipse.as.ui.editor.PortSection$WebPortEditorExtension" - serverIds="%JBossServer6AndBelow"> + serverIds="%AllJBossServerTypes"> </section> <section - class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7WebPortEditorExtension" - serverIds="%ServerTypesJBoss7"> - </section> - <section class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss6JMXRMIPortEditorExtension" serverIds="org.jboss.ide.eclipse.as.60"> </section>